Fixed typos

pborreli · pborreli · commit 60eeacd2d1f8 · 2012-12-14T22:27:02.000Z
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/EntityChoiceListTest.php
@@ -73,7 +73,7 @@ protected function tearDown()
      * @expectedException Symfony\Component\Form\Exception\FormException
      * @expectedMessage   Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).
      */
-    public function testEntitesMustHaveAToStringMethod()
+    public function testEntitiesMustHaveAToStringMethod()
     {
         $entity1 = new NoToStringSingleIdentEntity(1, 'Foo');
         $entity2 = new NoToStringSingleIdentEntity(2, 'Bar');
diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 
 /**
- * Widely inspirated by the EntityChoiceList.
+ * Widely inspired by the EntityChoiceList.
  *
  * @author William Durand <william.durand1@gmail.com>
  */
@@ -369,7 +369,7 @@ private function getIdentifierValues($model)
      *
      * @param ColumnMap $column
      *
-     * @return boolean
+     * @return Boolean
      */
     private function isInteger(\ColumnMap $column)
     {
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -37,6 +37,7 @@ public function __construct(\Twig_Environment $twig, $debug)
     /**
      * Converts an Exception to a Response.
      *
+     * @param Request              $request   The request
      * @param FlattenException     $exception A FlattenException instance
      * @param DebugLoggerInterface $logger    A DebugLoggerInterface instance
      * @param string               $format    The format to use for rendering (html, xml, ...)
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -174,7 +174,7 @@
              *
              * @param request   the request object
              * @param max       <subjected for removal>
-             * @param threshold the threshold (lower bound) of the length of the timeline (in miliseconds).
+             * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds).
              * @param width     the width of the canvas.
              */
             this.drawOne = function(request, max, threshold, width)
diff --git a/src/Symfony/Component/Config/Definition/ReferenceDumper.php b/src/Symfony/Component/Config/Definition/ReferenceDumper.php
@@ -38,7 +38,8 @@ public function dumpNode(NodeInterface $node)
     }
 
     /**
-     * @param int $depth
+     * @param NodeInterface $node
+     * @param integer       $depth
      */
     private function writeNode(NodeInterface $node, $depth = 0)
     {
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -886,7 +886,7 @@ public function providePathsForIsAbsolutePath()
     /**
      * Returns file permissions as three digits (i.e. 755)
      *
-     * @param string $filepath
+     * @param string $filePath
      *
      * @return integer
      */
diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php
@@ -273,7 +273,7 @@ public function hasEndJoker()
     }
 
     /**
-     * @param array $replacements
+     * @param array $replacement
      *
      * @return Regex
      */
diff --git a/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php b/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
@@ -866,7 +866,7 @@ public function testParseErrorStub($pattern, $value)
 
     public function parseErrorProvider()
     {
-        return array(
+        $data = array(
             // 1 char month
             array('y-MMMMM-d', '1970-J-1'),
             array('y-MMMMM-d', '1970-S-1'),
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -692,13 +692,13 @@ public function getStatus()
     /**
      * Stops the process.
      *
-     * @param float $timeout The timeout in seconds
+     * @param integer $timeout The timeout in seconds
      *
      * @return integer The exit-code of the process
      *
      * @throws RuntimeException if the process got signaled
      */
-    public function stop($timeout=10)
+    public function stop($timeout = 10)
     {
         $timeoutMicro = (int) $timeout*10E6;
         if ($this->isRunning()) {
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -70,7 +70,7 @@ CHANGELOG
    it disallows the slash (`/`) and the next char. Using the previous char added
    no value and was problematic because the route `/index.{_format}` would be
    matched by `/index.ht/ml`.
- * The default requirement now uses possesive quantifiers when possible which
+ * The default requirement now uses possessive quantifiers when possible which
    improves matching performance by up to 20% because it prevents backtracking
    when it's not needed.
  * The ConfigurableRequirementsInterface can now also be used to disable the requirements
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -145,7 +145,7 @@ protected function parseImport(RouteCollection $collection, array $config, $path
      * @param string $path   The loaded file path
      *
      * @throws \InvalidArgumentException If one of the provided config keys is not supported,
-     *                                   something is missing or the combination is nonesense
+     *                                   something is missing or the combination is nonsense
      */
     protected function validate($config, $name, $path)
     {
@@ -154,7 +154,7 @@ protected function validate($config, $name, $path)
         }
         if ($extraKeys = array_diff(array_keys($config), self::$availableKeys)) {
             throw new \InvalidArgumentException(sprintf(
-                'The routing file "%s" contains unsupport keys for "%s": "%s". Expected one of: "%s".',
+                'The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".',
                 $path, $name, implode('", "', $extraKeys), implode('", "', self::$availableKeys)
             ));
         }
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -143,9 +143,9 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
     /**
      * Generates PHP code recursively to match a tree of routes
      *
-     * @param DumperPrefixCollection $routes               A DumperPrefixCollection instance
+     * @param DumperPrefixCollection $collection           A DumperPrefixCollection instance
      * @param Boolean                $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $prefix               Prefix of the parent collection
+     * @param string                 $parentPrefix         Prefix of the parent collection
      *
      * @return string PHP code
      */
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -389,7 +389,7 @@ public function getRequirement($key)
     /**
      * Checks if a requirement is set for the given key.
      *
-     * @param string $name A variable name
+     * @param string $key A variable name
      *
      * @return Boolean true if a requirement is specified, false otherwise
      */
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -98,7 +98,7 @@ public function testLoad($className, $routeDatas = array(), $methodArgs = array(
         $this->reader
             ->expects($this->once())
             ->method('getMethodAnnotations')
-            ->will($this->returnValue(array($this->getAnnotedRoute($routeDatas))))
+            ->will($this->returnValue(array($this->getAnnotatedRoute($routeDatas))))
         ;
         $routeCollection = $this->loader->load($className);
         $route = $routeCollection->get($routeDatas['name']);
@@ -109,7 +109,7 @@ public function testLoad($className, $routeDatas = array(), $methodArgs = array(
         $this->assertSame(array_replace($routeDatas['defaults'], $methodArgs), $route->getDefaults(), '->load preserves defaults annotation');
     }
 
-    private function getAnnotedRoute($datas)
+    private function getAnnotatedRoute($datas)
     {
         return new \Symfony\Component\Routing\Annotation\Route($datas);
     }
diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
@@ -225,7 +225,7 @@ public function provideCompileWithHostnameData()
                 ),
             ),
             array(
-                'Route with variable at begining of hostname',
+                'Route with variable at beginning of hostname',
                 array('/hello', array(), array(), array(), '{locale}.example.{tld}'),
                 '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array(
                     array('text', '/hello'),
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -36,7 +36,7 @@ public function testPattern()
         $this->assertEquals('/bar', $route->getPattern(), '->setPattern() adds a / at the beginning of the pattern if needed');
         $this->assertEquals($route, $route->setPattern(''), '->setPattern() implements a fluent interface');
         $route->setPattern('//path');
-        $this->assertEquals('/path', $route->getPattern(), '->setPattern() does not allow two slahes "//" at the beginning of the pattern as it would be confused with a network path when generating the path from the route');
+        $this->assertEquals('/path', $route->getPattern(), '->setPattern() does not allow two slashes "//" at the beginning of the pattern as it would be confused with a network path when generating the path from the route');
     }
 
     public function testOptions()
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
@@ -28,7 +28,7 @@ class Dumper
     /**
      * Sets the indentation.
      *
-     * @param integer $num The amount of spaces to use for intendation of nested nodes.
+     * @param integer $num The amount of spaces to use for indentation of nested nodes.
      */
     public function setIndentation($num)
     {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected function tearDown()`
`73`	`73`	`* @expectedException Symfony\Component\Form\Exception\FormException`
`74`	`74`	`* @expectedMessage Entity "Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).`
`75`	`75`	`*/`
`76`		`- public function testEntitesMustHaveAToStringMethod()`
	`76`	`+ public function testEntitiesMustHaveAToStringMethod()`
`77`	`77`	`{`
`78`	`78`	`$entity1 = new NoToStringSingleIdentEntity(1, 'Foo');`
`79`	`79`	`$entity2 = new NoToStringSingleIdentEntity(2, 'Bar');`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * Widely inspirated by the EntityChoiceList.`
	`21`	`+ * Widely inspired by the EntityChoiceList.`
`22`	`22`	`*`
`23`	`23`	`* @author William Durand <[email protected]>`
`24`	`24`	`*/`
`@@ -369,7 +369,7 @@ private function getIdentifierValues($model)`
`369`	`369`	`*`
`370`	`370`	`* @param ColumnMap $column`
`371`	`371`	`*`
`372`		`- * @return boolean`
	`372`	`+ * @return Boolean`
`373`	`373`	`*/`
`374`	`374`	`private function isInteger(\ColumnMap $column)`
`375`	`375`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public function __construct(\Twig_Environment $twig, $debug)`
`37`	`37`	`/**`
`38`	`38`	`* Converts an Exception to a Response.`
`39`	`39`	`*`
	`40`	`+ * @param Request $request The request`
`40`	`41`	`* @param FlattenException $exception A FlattenException instance`
`41`	`42`	`* @param DebugLoggerInterface $logger A DebugLoggerInterface instance`
`42`	`43`	`* @param string $format The format to use for rendering (html, xml, ...)`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@`
`174`	`174`	`*`
`175`	`175`	`* @param request the request object`
`176`	`176`	`* @param max <subjected for removal>`
`177`		`- * @param threshold the threshold (lower bound) of the length of the timeline (in miliseconds).`
	`177`	`+ * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds).`
`178`	`178`	`* @param width the width of the canvas.`
`179`	`179`	`*/`
`180`	`180`	`this.drawOne = function(request, max, threshold, width)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public function dumpNode(NodeInterface $node)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`		`- * @param int $depth`
	`41`	`+ * @param NodeInterface $node`
	`42`	`+ * @param integer $depth`
`42`	`43`	`*/`
`43`	`44`	`private function writeNode(NodeInterface $node, $depth = 0)`
`44`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ public function providePathsForIsAbsolutePath()`
`886`	`886`	`/**`
`887`	`887`	`* Returns file permissions as three digits (i.e. 755)`
`888`	`888`	`*`
`889`		`- * @param string $filepath`
	`889`	`+ * @param string $filePath`
`890`	`890`	`*`
`891`	`891`	`* @return integer`
`892`	`892`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function hasEndJoker()`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`/**`
`276`		`- * @param array $replacements`
	`276`	`+ * @param array $replacement`
`277`	`277`	`*`
`278`	`278`	`* @return Regex`
`279`	`279`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ public function testParseErrorStub($pattern, $value)`
`866`	`866`
`867`	`867`	`public function parseErrorProvider()`
`868`	`868`	`{`
`869`		`- return array(`
	`869`	`+ $data = array(`
`870`	`870`	`// 1 char month`
`871`	`871`	`array('y-MMMMM-d', '1970-J-1'),`
`872`	`872`	`array('y-MMMMM-d', '1970-S-1'),`
Original file line number	Diff line number	Diff line change
`@@ -692,13 +692,13 @@ public function getStatus()`
`692`	`692`	`/**`
`693`	`693`	`* Stops the process.`
`694`	`694`	`*`
`695`		`- * @param float $timeout The timeout in seconds`
	`695`	`+ * @param integer $timeout The timeout in seconds`
`696`	`696`	`*`
`697`	`697`	`* @return integer The exit-code of the process`
`698`	`698`	`*`
`699`	`699`	`* @throws RuntimeException if the process got signaled`
`700`	`700`	`*/`
`701`		`- public function stop($timeout=10)`
	`701`	`+ public function stop($timeout = 10)`
`702`	`702`	`{`
`703`	`703`	`$timeoutMicro = (int) $timeout*10E6;`
`704`	`704`	`if ($this->isRunning()) {`