merged branch pborreli/typophpdoc (PR #6710)

This PR was merged into the master branch.

Commits
-------

b1c6881 Fixed PHPDoc

Discussion
----------

Fixed PHPDoc
This commit is contained in:
Fabien Potencier 2013-01-12 08:12:39 +01:00
commit 3245c1ce3a
6 changed files with 8 additions and 5 deletions

View File

@ -26,7 +26,7 @@ class HttpKernelExtension extends \Twig_Extension
/** /**
* Constructor. * Constructor.
* *
* @param HttpContentRenderer $kernel A HttpContentRenderer instance * @param HttpContentRenderer $renderer A HttpContentRenderer instance
*/ */
public function __construct(HttpContentRenderer $renderer) public function __construct(HttpContentRenderer $renderer)
{ {

View File

@ -27,7 +27,7 @@ class ActionsHelper extends Helper
/** /**
* Constructor. * Constructor.
* *
* @param HttpContentRenderer $kernel A HttpContentRenderer instance * @param HttpContentRenderer $renderer A HttpContentRenderer instance
*/ */
public function __construct(HttpContentRenderer $renderer) public function __construct(HttpContentRenderer $renderer)
{ {

View File

@ -952,8 +952,9 @@ EOF;
/** /**
* Checks if a service id has a reference * Checks if a service id has a reference
* *
* @param string $id * @param string $id
* @param array $arguments * @param array $arguments
* @param Boolean $deep
* *
* @return Boolean * @return Boolean
*/ */

View File

@ -251,6 +251,7 @@ class Command
* Insert a string or a Command instance before the bit at given position $index (index starts from 0). * Insert a string or a Command instance before the bit at given position $index (index starts from 0).
* *
* @param string|Command $bit * @param string|Command $bit
* @param integer $index
* *
* @return Command The current Command instance * @return Command The current Command instance
*/ */

View File

@ -44,6 +44,7 @@ class RequestContext
* @param string $scheme The HTTP scheme * @param string $scheme The HTTP scheme
* @param integer $httpPort The HTTP port * @param integer $httpPort The HTTP port
* @param integer $httpsPort The HTTPS port * @param integer $httpsPort The HTTPS port
* @param string $path The path
* *
* @api * @api
*/ */

View File

@ -35,7 +35,7 @@ class HttpUtils
* Constructor. * Constructor.
* *
* @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance * @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance
* @param UrlMatcherInterface|RequestMatcherInterface $matcher The Url or Request matcher * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The Url or Request matcher
*/ */
public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null) public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null)
{ {