merged branch pborreli/typophpdoc (PR #6710)

fabpot · fabpot · commit 3245c1ce3ab6 · 2013-01-12T08:12:39.000+01:00
This PR was merged into the master branch. Commits ------- b1c6881 Fixed PHPDoc Discussion ---------- Fixed PHPDoc
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -26,7 +26,7 @@ class HttpKernelExtension extends \Twig_Extension
     /**
      * Constructor.
      *
-     * @param HttpContentRenderer $kernel A HttpContentRenderer instance
+     * @param HttpContentRenderer $renderer A HttpContentRenderer instance
      */
     public function __construct(HttpContentRenderer $renderer)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php
@@ -27,7 +27,7 @@ class ActionsHelper extends Helper
     /**
      * Constructor.
      *
-     * @param HttpContentRenderer $kernel A HttpContentRenderer instance
+     * @param HttpContentRenderer $renderer A HttpContentRenderer instance
      */
     public function __construct(HttpContentRenderer $renderer)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -952,8 +952,9 @@ private function getDefinitionsFromArguments(array $arguments)
     /**
      * Checks if a service id has a reference
      *
-     * @param string $id
-     * @param array  $arguments
+     * @param string  $id
+     * @param array   $arguments
+     * @param Boolean $deep
      *
      * @return Boolean
      */
diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php
@@ -251,6 +251,7 @@ function($bit) { return null !== $bit; }
      * Insert a string or a Command instance before the bit at given position $index (index starts from 0).
      *
      * @param string|Command $bit
+     * @param integer        $index
      *
      * @return Command The current Command instance
      */
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
@@ -44,6 +44,7 @@ class RequestContext
      * @param string  $scheme    The HTTP scheme
      * @param integer $httpPort  The HTTP port
      * @param integer $httpsPort The HTTPS port
+     * @param string  $path      The path
      *
      * @api
      */
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -35,7 +35,7 @@ class HttpUtils
      * Constructor.
      *
      * @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)
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class HttpKernelExtension extends \Twig_Extension`
`26`	`26`	`/**`
`27`	`27`	`* Constructor.`
`28`	`28`	`*`
`29`		`- * @param HttpContentRenderer $kernel A HttpContentRenderer instance`
	`29`	`+ * @param HttpContentRenderer $renderer A HttpContentRenderer instance`
`30`	`30`	`*/`
`31`	`31`	`public function __construct(HttpContentRenderer $renderer)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class ActionsHelper extends Helper`
`27`	`27`	`/**`
`28`	`28`	`* Constructor.`
`29`	`29`	`*`
`30`		`- * @param HttpContentRenderer $kernel A HttpContentRenderer instance`
	`30`	`+ * @param HttpContentRenderer $renderer A HttpContentRenderer instance`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(HttpContentRenderer $renderer)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -952,8 +952,9 @@ private function getDefinitionsFromArguments(array $arguments)`
`952`	`952`	`/**`
`953`	`953`	`* Checks if a service id has a reference`
`954`	`954`	`*`
`955`		`- * @param string $id`
`956`		`- * @param array $arguments`
	`955`	`+ * @param string $id`
	`956`	`+ * @param array $arguments`
	`957`	`+ * @param Boolean $deep`
`957`	`958`	`*`
`958`	`959`	`* @return Boolean`
`959`	`960`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,7 @@ function($bit) { return null !== $bit; }`
`251`	`251`	`* Insert a string or a Command instance before the bit at given position $index (index starts from 0).`
`252`	`252`	`*`
`253`	`253`	`* @param string\|Command $bit`
	`254`	`+ * @param integer $index`
`254`	`255`	`*`
`255`	`256`	`* @return Command The current Command instance`
`256`	`257`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class RequestContext`
`44`	`44`	`* @param string $scheme The HTTP scheme`
`45`	`45`	`* @param integer $httpPort The HTTP port`
`46`	`46`	`* @param integer $httpsPort The HTTPS port`
	`47`	`+ * @param string $path The path`
`47`	`48`	`*`
`48`	`49`	`* @api`
`49`	`50`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class HttpUtils`
`35`	`35`	`* Constructor.`
`36`	`36`	`*`
`37`	`37`	`* @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance`
`38`		`- * @param UrlMatcherInterface\|RequestMatcherInterface $matcher The Url or Request matcher`
	`38`	`+ * @param UrlMatcherInterface\|RequestMatcherInterface $urlMatcher The Url or Request matcher`
`39`	`39`	`*/`
`40`	`40`	`public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatcher = null)`
`41`	`41`	`{`