Merge the ParamConverters on class level and the ParamConverters in method level
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