diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index b0f0b39526bbc..f92207103967b 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -68,6 +68,7 @@ public function evaluate($expression, $values = array())
      * Parses an expression.
      *
      * @param Expression|string $expression The expression to parse
+     * @param array             $names      An array of valid names
      *
      * @return ParsedExpression A ParsedExpression instance
      */
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
index 9bd8b3514026c..fd265ad81f2a4 100644
--- a/src/Symfony/Component/ExpressionLanguage/Lexer.php
+++ b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -24,6 +24,8 @@ class Lexer
      * @param string $expression The expression to tokenize
      *
      * @return TokenStream A token stream instance
+     *
+     * @throws SyntaxError
      */
     public function tokenize($expression)
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index ee013811ec7df..f0d23212419e2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -79,6 +79,8 @@ public function __construct(array $functions)
      * @param array       $names  An array of valid names
      *
      * @return Node A node tree
+     *
+     * @throws SyntaxError
      */
     public function parse(TokenStream $stream, $names = array())
     {
diff --git a/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php b/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
index de9f3e714a3b8..c88c763173c4a 100644
--- a/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
+++ b/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Filesystem\Exception;
 
 /**
- * IOException interface for file and input/output stream releated exceptions thrown by the component.
+ * IOException interface for file and input/output stream related exceptions thrown by the component.
  *
  * @author Christian Gärtner <christiangaertner.film@googlemail.com>
  */
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 9e45d2ba3b18a..3b1c9bde65a92 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -32,7 +32,7 @@ class Filesystem
      * @param string  $targetFile The target filename
      * @param boolean $override   Whether to override an existing file or not
      *
-     * @throws FileNotFoundException    When orginFile doesn't exist
+     * @throws FileNotFoundException    When originFile doesn't exist
      * @throws IOException              When copy fails
      */
     public function copy($originFile, $targetFile, $override = false)
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 543d6c5b042e6..2119248132963 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -34,7 +34,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
     /**
      * Stores the collected data per {@link FormInterface} instance.
      *
-     * Uses the hashes of the forms as keys. This is preferrable over using
+     * Uses the hashes of the forms as keys. This is preferable over using
      * {@link \SplObjectStorage}, because in this way no references are kept
      * to the {@link FormInterface} instances.
      *
@@ -45,7 +45,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
     /**
      * Stores the collected data per {@link FormView} instance.
      *
-     * Uses the hashes of the views as keys. This is preferrable over using
+     * Uses the hashes of the views as keys. This is preferable over using
      * {@link \SplObjectStorage}, because in this way no references are kept
      * to the {@link FormView} instances.
      *
@@ -57,7 +57,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
      * Connects {@link FormView} with {@link FormInterface} instances.
      *
      * Uses the hashes of the views as keys and the hashes of the forms as
-     * values. This is preferrable over storing the objects directly, because
+     * values. This is preferable over storing the objects directly, because
      * this way they can safely be discarded by the GC.
      *
      * @var array
diff --git a/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
index 083176e670acd..b6cd54cd82930 100644
--- a/src/Symfony/Component/Form/Tests/AbstractFormTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
@@ -57,6 +57,7 @@ abstract protected function createForm();
      * @param string                   $name
      * @param EventDispatcherInterface $dispatcher
      * @param string                   $dataClass
+     * @param array                    $options
      *
      * @return FormBuilder
      */