This PR was merged into the master branch.

Commits
-------

8e11cfa5 [Tests] Make use of the @requires annotation for PHP version
1e0dd622 Fix Doctrine tests

Discussion
----------

[Test] Improvements

see https://github.com/fabpot/Silex/pull/620

This PR was merged into the master branch.

Commits
-------

46e6e283 [Doc] Fix references to Symfony 2.0
9eb3b9b2 [Doc] Document Application::sendFile()
570df9d4 implement feedback
734d5738 [Application] Add the ability to send files

Discussion
----------

[Application] Add the ability to send files

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

by GromNaN at 2013-02-06T17:10:24Z

Nice feature 👍

As the `->json` method creates a `JsonResponse`, for consistency the method that create a `BinaryFileResponse` should be named `->binaryFile`.

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

by vicb at 2013-02-06T17:14:43Z

I deeply love consistency but I really can't be consistent with a method named `json` !

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

by vicb at 2013-02-06T18:01:40Z

@igorw will do thanks.

i have also warneed f&j about the test result, subtree split ?

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

by vicb at 2013-02-07T10:29:07Z

@igorw thanks for the feedback, all should be fixed.

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

by fabpot at 2013-02-07T11:26:50Z

Can you add a note in the documentation about this new feature?

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

by vicb at 2013-02-07T12:15:10Z

@fabpot, the doc has been updated

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

by vicb at 2013-02-07T12:23:10Z

@fabpot did you get my email regarding the issue with the tests (sub-stree split ?).

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

by igorw at 2013-02-07T15:45:09Z

Looks good to me. 👍

This PR was merged into the master branch.

Commits
-------

3eaa38cf Clarify provider conventions for params

Discussion
----------

Clarify provider conventions for params

The current conventions for parameters is outdated. At some point we
decided that providers can define default values for params. Therefore
parameters must be registered *after* the extension is registered.

Related commit: 9766faf0

This PR was merged into the master branch.

Commits
-------

79d40aed implement feedback
4e36a6a4 doc tweaks

Discussion
----------

minor doc tweaks

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

by vicb at 2013-02-07T10:30:20Z

@igorw fixed, thanks.

This PR was merged into the master branch.

Commits
-------

96e71626 [doc] Scope consistency with previous example

Discussion
----------

[doc] Consistency with previous example

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

by igorw at 2013-02-06T18:00:25Z

👍

The current conventions for parameters is outdated. At some point we
decided that providers can define default values for params. Therefore
parameters must be registered *after* the extension is registered.

Related commit: 9766faf0

This PR was merged into the master branch.

Commits
-------

64b66b13 [docs] Adjust symfony/* constraints to use tilde operator

Discussion
----------

[docs] Adjust symfony/* constraints to use tilde operator

This will hopefully make upgrade to 2.2 more seamless

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

Commits
-------

8c2b5755 OS independent regexp in Monolog test case

Discussion
----------

OS independent regexp in Monolog test case

Minor correction to make this test case pass on Windows

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

by igorw at 2013-01-05T17:11:05Z

Maybe just change the test to check for `very bad error` - seems less messy.

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

by davedevelopment at 2013-01-06T20:59:30Z

Or just .* the whole path up to the filename

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

by igorw at 2013-01-06T23:46:14Z

👍

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

by igorw at 2013-02-05T12:51:31Z

Can we get this merged please? We now have other PRs like #614 duplicating this effort.

This will hopefully make upgrade to 2.2 more seamless

This PR was merged into the master branch.

Commits
-------

7c1f6a5c Improve constraints of fat composer.json

Discussion
----------

Improve constraints of fat composer.json

* Change symfony/* from 2.1.* => ~2.1
* Delegate twig and monolog version selection to bridges

* Change symfony/* from 2.1.* => ~2.1
* Delegate twig and monolog version selection to bridges

This PR was merged into the master branch.

Commits
-------

94685096 Make reason of prenatal code visible.

Discussion
----------

Make reason of prenatal code visible.

Code is commented since ages, the reason is missing (because there is a reason).

See #594

This PR was merged into the master branch.

Commits
-------

48ec9b11 Make test ignore JSON semantics

Discussion
----------

Make test ignore JSON semantics

One fix for Symfony 2.2, related to #607 and symfony/symfony#5506

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

Commits
-------

dc8ee5d8 [WIP] Make test suite run against symfony/* 2.2

Discussion
----------

[WIP] Make test suite run against symfony/* 2.2

There are still quite a few tests failing. Feel free to send PRs my way.

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

Commits
-------

b6606a7c Updated HttpCacheServiceProvider documentation

Discussion
----------

Updated HttpCacheServiceProvider documentation

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

by igorw at 2013-01-23T12:38:25Z

👍

This PR was merged into the master branch.

Commits
-------

310d316d Make ValidatorServiceProvider work with both 2.1 and 2.2 of symfony/validator

Discussion
----------

Make ValidatorServiceProvider work with both 2.1 and 2.2 of symfony/validator

Closes #584, #585.

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

by davedevelopment at 2013-01-23T14:59:35Z

👍 Let's get this in

Closes #584, #585.

This PR was merged into the master branch.

Commits
-------

11fda10c Updated Application register and mount methods to return Application

Discussion
----------

Updated Application register and mount methods to return Application

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

by jeremyFreeAgent at 2013-01-21T17:43:08Z

Thanky @igorw, I've fixed that.

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

by igorw at 2013-01-21T17:44:15Z

I'm not opposed to this, but if we add it for `register` we should also do it for `mount` imo.

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

by jeremyFreeAgent at 2013-01-21T17:44:18Z

You were faster than @stof on that one!

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

by jeremyFreeAgent at 2013-01-21T17:48:03Z

Yes, for `mount` too... Do I add it ?

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

by igorw at 2013-01-21T18:49:33Z

You can add it as a separate commit. If we decide that it is not needed for `mount`, you can rebase that commit out ;-)

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

by jeremyFreeAgent at 2013-01-21T23:17:50Z

I've pushed it in the PR #604.

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

by jeremyFreeAgent at 2013-01-22T10:15:19Z

Is that better this way?

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

by igorw at 2013-01-22T14:09:29Z

I would have two tests in the ApplicationTest: `testRegisterShouldReturnSelf`, `testMountShouldReturnSelf`.

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

by jeremyFreeAgent at 2013-01-22T14:17:21Z

Done!

This PR was merged into the master branch.

Commits
-------

8e8b96ec Remove all "before 1.0" exceptions and services.

Discussion
----------

Remove all "before 1.0" exceptions and services.

All theese 1.0 exceptions have been deprecated for a long time. At least since composer started to be used and since it have become so widespread i think i is time to remove thoose.

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

by fabpot at 2013-01-21T09:54:36Z

👍

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

by Baachi at 2013-01-21T10:00:08Z

👍

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

by GromNaN at 2013-01-21T14:12:22Z

👍

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

by igorw at 2013-01-21T14:58:39Z

👍 It's been 7 months and removing these will not break anything.

Code is commented since ages, the reason is missing (because there is a reason).

This PR was merged into the master branch.

Commits
-------

61bbc748 Update doc/providers/serializer.rst

Discussion
----------

Update doc/providers/serializer.rst

fixed links

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

by igorw at 2013-01-20T00:48:17Z

👍 thanks

fixed links