diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index 476894b53d..70d1b72ebf 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -32,10 +32,12 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
      *
      * @see BaseDateTimeTransformer::formats for available format options
      *
-     * @param string  $inputTimezone   The name of the input timezone
-     * @param string  $outputTimezone  The name of the output timezone
-     * @param integer $dateFormat      The date format
-     * @param integer $timeFormat      The time format
+     * @param string             $inputTimezone   The name of the input timezone
+     * @param string             $outputTimezone  The name of the output timezone
+     * @param integer            $dateFormat      The date format
+     * @param integer            $timeFormat      The time format
+     * @param \IntlDateFormatter $calendar        An \IntlDateFormatter instance
+     * @param string             $pattern         A pattern to pass to \IntlDateFormatter
      *
      * @throws UnexpectedTypeException If a format is not supported
      * @throws UnexpectedTypeException if a timezone is not a string
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index eacd563de6..b3fcfb41fd 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -300,7 +300,7 @@ class FormBuilder
     /**
      * Appends a transformer to the normalization transformer chain
      *
-     * @param DataTransformerInterface $clientTransformer
+     * @param DataTransformerInterface $normTransformer
      *
      * @return FormBuilder The current builder
      */
diff --git a/src/Symfony/Component/Form/Util/FormUtil.php b/src/Symfony/Component/Form/Util/FormUtil.php
index 62ceb545c5..bc521efff2 100644
--- a/src/Symfony/Component/Form/Util/FormUtil.php
+++ b/src/Symfony/Component/Form/Util/FormUtil.php
@@ -43,6 +43,7 @@ abstract class FormUtil
      * Returns whether the given choice is selected.
      *
      * @param mixed $choice The choice
+     * @param mixed $value  the value
      *
      * @return Boolean Whether the choice is selected
      */
diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
index 87abd01bcd..e6eb9ba2bb 100644
--- a/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
@@ -94,7 +94,8 @@ class FilesystemSessionStorage extends NativeSessionStorage
      *
      * The preferred format for a key is directory style so naming conflicts can be avoided.
      *
-     * @param  string $key  A unique key identifying your data
+     * @param string $key     A unique key identifying your data
+     * @param string $default The default value
      *
      * @return mixed Data associated with the key
      *
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index cda2121c30..f60af463f2 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -15,6 +15,7 @@ namespace Symfony\Component\Routing\Annotation;
  * Annotation class for @Route().
  *
  * @Annotation
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Route
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
index 36e8714357..975fe6d46e 100644
--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -31,7 +31,7 @@ class ParseException extends \RuntimeException implements ExceptionInterface
      * @param string    $message    The error message
      * @param integer   $parsedLine The line where the error occurred
      * @param integer   $snippet    The snippet of code near the problem
-     * @param string    $filename   The file name where the error occurred
+     * @param string    $parsedFile The file name where the error occurred
      * @param Exception $previous   The previous exception
      */
     public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, Exception $previous = null)
@@ -59,7 +59,7 @@ class ParseException extends \RuntimeException implements ExceptionInterface
     /**
      * Sets the snippet of code near the error.
      *
-     * @param string $parsedFile The filename
+     * @param string $snippet The code snippet
      */
     public function setSnippet($snippet)
     {