Permalink
Browse files

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)
  • Loading branch information...
fabpot committed Apr 7, 2013
2 parents bf30a3d + 2ea5eaa commit b11b0f7f26182607b29b08f373f8da62a748be1f
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -45,8 +45,8 @@ public function getFunctions()
/**
* 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 @@ public function renderFragment($uri, $options = array())
/**
* 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
*

0 comments on commit b11b0f7

Please sign in to comment.