minor #9518 Fixed typos (pborreli)

fabpot · fabpot · commit 8d8574543002 · 2013-11-19T19:29:47.000+01:00
This PR was merged into the master branch. Discussion ---------- Fixed typos Commits ------- 8ebf7c5 Fixed typos
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -57,6 +57,7 @@ abstract protected function createForm();
      * @param string                   $name
      * @param EventDispatcherInterface $dispatcher
      * @param string                   $dataClass
+     * @param array                    $options
      *
      * @return FormBuilder
      */

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ public function evaluate($expression, $values = array())`
`68`	`68`	`* Parses an expression.`
`69`	`69`	`*`
`70`	`70`	`* @param Expression\|string $expression The expression to parse`
	`71`	`+ * @param array $names An array of valid names`
`71`	`72`	`*`
`72`	`73`	`* @return ParsedExpression A ParsedExpression instance`
`73`	`74`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class Lexer`
`24`	`24`	`* @param string $expression The expression to tokenize`
`25`	`25`	`*`
`26`	`26`	`* @return TokenStream A token stream instance`
	`27`	`+ *`
	`28`	`+ * @throws SyntaxError`
`27`	`29`	`*/`
`28`	`30`	`public function tokenize($expression)`
`29`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ public function __construct(array $functions)`
`79`	`79`	`* @param array $names An array of valid names`
`80`	`80`	`*`
`81`	`81`	`* @return Node A node tree`
	`82`	`+ *`
	`83`	`+ * @throws SyntaxError`
`82`	`84`	`*/`
`83`	`85`	`public function parse(TokenStream $stream, $names = array())`
`84`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Filesystem\Exception;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * IOException interface for file and input/output stream releated exceptions thrown by the component.`
	`15`	`+ * IOException interface for file and input/output stream related exceptions thrown by the component.`
`16`	`16`	`*`
`17`	`17`	`* @author Christian Gärtner <christiangaertner.film@googlemail.com>`
`18`	`18`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class Filesystem`
`32`	`32`	`* @param string $targetFile The target filename`
`33`	`33`	`* @param boolean $override Whether to override an existing file or not`
`34`	`34`	`*`
`35`		`- * @throws FileNotFoundException When orginFile doesn't exist`
	`35`	`+ * @throws FileNotFoundException When originFile doesn't exist`
`36`	`36`	`* @throws IOException When copy fails`
`37`	`37`	`*/`
`38`	`38`	`public function copy($originFile, $targetFile, $override = false)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf`
`34`	`34`	`/**`
`35`	`35`	`* Stores the collected data per {@link FormInterface} instance.`
`36`	`36`	`*`
`37`		`- * Uses the hashes of the forms as keys. This is preferrable over using`
	`37`	`+ * Uses the hashes of the forms as keys. This is preferable over using`
`38`	`38`	`* {@link \SplObjectStorage}, because in this way no references are kept`
`39`	`39`	`* to the {@link FormInterface} instances.`
`40`	`40`	`*`
`@@ -45,7 +45,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf`
`45`	`45`	`/**`
`46`	`46`	`* Stores the collected data per {@link FormView} instance.`
`47`	`47`	`*`
`48`		`- * Uses the hashes of the views as keys. This is preferrable over using`
	`48`	`+ * Uses the hashes of the views as keys. This is preferable over using`
`49`	`49`	`* {@link \SplObjectStorage}, because in this way no references are kept`
`50`	`50`	`* to the {@link FormView} instances.`
`51`	`51`	`*`
`@@ -57,7 +57,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf`
`57`	`57`	`* Connects {@link FormView} with {@link FormInterface} instances.`
`58`	`58`	`*`
`59`	`59`	`* Uses the hashes of the views as keys and the hashes of the forms as`
`60`		`- * values. This is preferrable over storing the objects directly, because`
	`60`	`+ * values. This is preferable over storing the objects directly, because`
`61`	`61`	`* this way they can safely be discarded by the GC.`
`62`	`62`	`*`
`63`	`63`	`* @var array`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ abstract protected function createForm();`
`57`	`57`	`* @param string $name`
`58`	`58`	`* @param EventDispatcherInterface $dispatcher`
`59`	`59`	`* @param string $dataClass`
	`60`	`+ * @param array $options`
`60`	`61`	`*`
`61`	`62`	`* @return FormBuilder`
`62`	`63`	`*/`