This PR was merged into the master branch.

Commits
-------

6e8d404e Add symfony/property-access require for 2.2
337a92c4 Make travis pass on Symfony 2.2

Discussion
----------

Make travis pass on Symfony 2.2

Make travis actually update the lock file and install the 2.2 components.
Document deprecation of getClassMetadata in validator docs.

This gives an actual good version of symfony/form instead of some old beta.

Make travis actually update the lock file and install the 2.2 components.
Document deprecation of getClassMetadata in validator docs.

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

Commits
-------

abdc1fc7 Updated docs to include _method and enableHttpMethodParameterOverride()

Discussion
----------

Updated docs to include _method and enableHttpMethodParameterOverride()

Should be self explanatory. Small addition to the docs to explain about the _method form value and also to advise abut the explicit enableHttpMethodParameterOverride() call required with Symfony 2.2.0 and later.

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

by igorw at 2013-02-18T13:57:37Z

Please wrap the docs at 80 chars.

👍

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

by davedevelopment at 2013-02-18T14:02:08Z

👍

Only one thing, do we need to explicitly state to do this before the request is handled? No-brainer to us, but what about others?

Or should I say, how likely are people to try and do something like:

``` php

$app->put("/some/resource", function(Request $request) {
    Request::enableHttpMethodParameterOverride();
});

```

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

by robdudley at 2013-02-18T14:11:15Z

I've used a similar example to the reverse proxy tip which I hope would make the context clear. Not sure how else to word it without becoming unnecessarily verbose. Also I'm assuming that the setting is going to be rolled into core at some point as it has pretty big backwards compatibility implications.

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

by davedevelopment at 2013-02-18T14:14:00Z

:shipit:

This PR was merged into the master branch.

Commits
-------

7e554db2 improved the performance of the Twig loader by not registering a chain loader if not needed

Discussion
----------

improved the performance of the Twig loader by not registering a chain loader if not needed

When `twig.templates` is empty, there is no need to register the Twig array loader as it will never be used anyway.

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

by lyrixx at 2013-02-18T09:50:07Z

totally 👍 More over, I think this feature was not documented.

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

by GromNaN at 2013-02-18T10:04:32Z

Nice tip. How much is it more performant ?

@lyrixx it is documented here : http://silex.sensiolabs.org/doc/providers/twig.html#parameters

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

by fabpot at 2013-02-18T10:06:17Z

It's not really about how much but just keeping the array loader around is a waste of time.

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

by igorw at 2013-02-18T13:37:58Z

👎 This prevents extending the `twig.loader` service and also feels like a micro-optimization to me.

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

by fabpot at 2013-02-18T13:57:13Z

I've removed the optimization but I've kept the different order in registration as it makes more sense.

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

by igorw at 2013-02-18T13:59:55Z

👍

This PR was merged into the master branch.

Commits
-------

fbffc2b0 Enable logger and stopwatch for Doctrine queries

Discussion
----------

Add logger and stopwatch for Doctrine queries

Add SQL queries to the logs using the DbalLogger of the DoctrineBridge.

In addition, if the WebprofilerServiceProvider is registered (stopwatch service set), the timeline show doctrine queries.

![Profiler](https://f.cloud.github.com/assets/400034/152414/877dc396-75c4-11e2-96df-6dde93c7d86e.png)

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

by DerManoMann at 2013-02-13T10:37:42Z

👍

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

by fabpot at 2013-02-13T10:39:34Z

I'm wondering if the stopwatch service should be moved to Silex core.

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

by lyrixx at 2013-02-13T11:05:00Z

Totally 👍 for moving it to silex.

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

by GromNaN at 2013-02-13T11:16:20Z

Is there a use case for the "stopwatch" outside of the webprofiler ?

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

by lyrixx at 2013-02-13T11:23:44Z

@GromNaN Yes, it you want to bench some code.

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

by henrikbjorn at 2013-02-13T11:35:28Z

@fabpot please not it will only add cruft. i think it is a niche thing to use the Stopwatch component.

This PR was merged into the master branch.

Commits
-------

829c8085 [Application] fix typo

Discussion
----------

[Application] fix typo

This PR was merged into the master branch.

Commits
-------

ef85340f Fixed brace and spaces
6ec11533 Changed Assert\MinLength to Assert\Length in doc

Discussion
----------

Removed Assert\minLength in doc

Changed to Assert\Length

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

by igorw at 2013-02-05T00:10:22Z

For the record, this change is due to Assert\MinLength and MaxLength being deprecated in 2.1, in favour of Length.

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

by igorw at 2013-02-05T00:16:47Z

👍

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

by fabpot at 2013-02-07T11:22:31Z

As we still support 2.1 and 2.2, I would suggest to add a note to indicate the name of the constraint in 2.1.

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

by igorw at 2013-02-11T14:23:51Z

@fabpot Length is already available in 2.1. There is no reason not to use it already. This PR looks good to me.

This PR was merged into the master branch.

Commits
-------

e055ed3e [docs] Add code examples for PUT and DELETE routes

Discussion
----------

[docs] Add code examples for PUT and DELETE routes

This PR was merged into the master branch.

Commits
-------

1e2655f4 Remove the "show" verb from example routes names

Discussion
----------

[docs] Remove the "show" verb from example routes names

This changes all examples from /blog/show/{id} to /blog/{id}. This makes
more sense in terms of HTTP, since the HTTP methods are the verbs and
the URL represents a resource.

This changes all examples from /blog/show/{id} to /blog/{id}. This makes
more sense in terms of HTTP, since the HTTP methods are the verbs and
the URL represents a resource.

This PR was merged into the master branch.

Commits
-------

3a5d992c Replace individual test suite component checks with global one

Discussion
----------

Replace individual test suite component checks with global one

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

by davedevelopment at 2013-02-09T19:43:06Z

👍 nice to see code disappearing

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.