diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)

Browse Source 
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)
This commit is contained in:
Fabien Potencier 2013-04-07 18:29:31 +02:00
commit b11b0f7f26
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
View File

@ -45,8 +45,8 @@ class HttpKernelExtension extends \Twig_Extension
/**
* Renders a fragment.
*
* @param string $uri A URI
* @param array $options An array of options
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
* @param array $options An array of options
*
* @return string The fragment content
*
@ -65,9 +65,9 @@ class HttpKernelExtension extends \Twig_Extension
/**
* Renders a fragment.
*
* @param string $strategy A strategy name
* @param string $uri A URI
* @param array $options An array of options
* @param string $strategy A strategy name
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
* @param array $options An array of options
*
* @return string The fragment content
*