Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)

This PR was merged into the 2.2 branch.

Discussion
----------

[Symfony\Bridge\Twig\Extension] fixed two methods' documentation blocks

| Q             | A
| ------------- | ---
| Fixed tickets | None
| License       | MIT

Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)

Commits
-------

2ea5eaa Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)