Merge the ParamConverters on class level and the ParamConverters in method level
Fix missing curly braces
merged branch benja-M-1/patch-1 (PR #193)

This PR was merged into the master branch.

Commits
-------

4155660 Fix missing curly braces

Discussion
----------

Fix missing curly braces
updated composer.json deps
added a Travis file
fixed unit tests
merged branch Burgov/merge_class_and_method_configs (PR #188)

This PR was merged into the master branch.

Commits
-------

c8c4e9a Merge the ParamConverters on class level and the ParamConverters in method level

Discussion
----------

Merge the ParamConverters on class level and the ParamConverters in method level

I have the following controller:

```
/**
 * Location controller.
 *
 * @Route("/approve/period/{period_id}", requirements={"period_id":"\d+"})
 * @ParamConverter("period", options={"id"="period_id"})
 */
class ApprovementController extends Controller
{

    /**
     * @Route("/department/{department_id}/approve", name="something", requirements={"department_id":"\d+"}, defaults={"_format":"json"}, options={"expose":true})
     * @ParamConverter("department", options={"id"="department_id"})
     */
    public function approveDayAction(Department $department, Period $period)
    {
        [...]
    }
}
```

The problem here is that due to the way the annotations are merged, the ParamConverter on class level was dropped, and overridden by that on method level, instead of merged into it's array.

As a workaround, I had to copy the class level annotation to the method level annotation

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

by Burgov at 2013-01-09T15:59:30Z

btw, is this the right branch for this PR?

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

by Burgov at 2013-01-30T09:55:56Z

ping @fabpot
fixed CS
Documented the repository_method option

Closes issue #198
merged branch Gregoire-M/patch-1 (PR #199)

This PR was merged into the master branch.

Commits
-------

fa31299 Documented the repository_method option

Discussion
----------

Documented the repository_method option

Closes issue #198
[Route] Ensure @Route.service is not defined on methods (fix #192)
merged branch vicb/route/service (PR #200)

This PR was merged into the master branch.

Commits
-------

3e6f536 [Route] Ensure @Route.service is not defined on methods (fix #192)

Discussion
----------

[Route] Ensure @Route.service is not defined on methods (fix #192)

| Q             | A
| ------------- | ---
| Bug fix?      | yes/no, throw an exception rather than silently ignore the service option
| New feature?  | yes, throw an exception rather than silently ignore the service option
| BC breaks?    | kind of if the configuration was wrong
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #192
| License       | MIT
| Doc PR        | -
DoctrineParamConverter should allow 0 as valid identifier
merged branch borisguery/id-0-should-not-throw-an-exception (PR #183)

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

Commits
-------

9c6b671 DoctrineParamConverter should allow 0 as valid identifier

Discussion
----------

DoctrineParamConverter should allow 0 as valid identifier

Use case:

* I've a route like `/items/{item}` where item is an unique number.

* If I try to fetch the item identified by a `0` it throws

 `\LogicException('Unable to guess how to get a Doctrine instance from the request information.');`

This is because in the `find()` method it "validates" the identifier as being not false but without strict type check resulting in `0` being evaluated to `false`, which is, strictly speaking, wrong.

[DoctrineParamConverter.php::find()](https://github.com/sensio/SensioFrameworkExtraBundle/blob/946f74bd4aa78b311c08b14f8a934ec30f20defd/Request/ParamConverter/DoctrineParamConverter.php#L71)

I wrote a test case which fails when using a 0 as an identifier and a fix using a strict type check to get ride of this.
Merge branch '2.1'

* 2.1:
  DoctrineParamConverter should allow 0 as valid identifier
made doctrine conversion optional depending on the parameter default value
apply method relies on some methods not present in the interface contract
merged branch bamarni/default-null (PR #201)

This PR was merged into the master branch.

Commits
-------

f5d9270 apply method relies on some methods not present in the interface contract
4bfdad6 made doctrine conversion optional depending on the parameter default value

Discussion
----------

made doctrine conversion optional

cc @fabpot @borisguery

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

by bamarni at 2013-02-21T11:25:22Z

ouch I can see it has been merged in 2.1, I'll rebase it and retarget as soon as i can.

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

by bamarni at 2013-02-21T20:34:11Z

cf #203
Update composer.json

Bump dependency of doctrine common for symfony 2.1 users.
merged branch guilhermeblanco/patch-3 (PR #202)

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

Commits
-------

3fa2c5c Update composer.json

Discussion
----------

Update composer.json

Bump dependency of doctrine common for symfony 2.1 users.