minor #9450 Fixed typos (pborreli)

fabpot · fabpot · commit 705384bc5fcd · 2013-11-09T12:55:32.000+01:00
This PR was squashed before being merged into the master branch (closes #9450). Discussion ---------- Fixed typos Commits ------- e8af42e Fixed typos
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -47,7 +47,7 @@ class DoctrineTokenProvider implements TokenProviderInterface
     private $conn;
 
     /**
-     * new DoctrineTokenProvider for the RemembeMe authentication service
+     * new DoctrineTokenProvider for the RememberMe authentication service
      *
      * @param \Doctrine\DBAL\Connection $conn
      */
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -39,7 +39,7 @@ public function __construct()
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @param boolean $lazyLoad whether to try lazy-loading the service with a proxy
+     * @param Boolean $lazyLoad whether to try lazy-loading the service with a proxy
      *
      * @return stdClass A stdClass instance.
      */
@@ -109,6 +109,8 @@ public function __set($name, $value)
 
     /**
      * @param string $name
+     *
+     * @return Boolean
      */
     public function __isset($name)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -125,7 +125,7 @@ public function fileExcerpt($file, $line)
             if (extension_loaded('fileinfo')) {
                 $finfo = new \Finfo();
 
-                // Check if the file is an application/octet-stream (eg. Phar file) because hightlight_file cannot parse these files
+                // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
                 if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
                     return;
                 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -83,9 +83,9 @@ protected function getRawContainer()
 
     protected function getContainer()
     {
-        $containter = $this->getRawContainer();
-        $containter->compile();
+        $container = $this->getRawContainer();
+        $container->compile();
 
-        return $containter;
+        return $container;
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
@@ -34,7 +34,7 @@ public function addElement(Node $value, Node $key = null)
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler A Compiler instance
+     * @param Compiler $compiler A Compiler instance
      */
     public function compile(Compiler $compiler)
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ParserCacheInterface.php
@@ -21,8 +21,8 @@ interface ParserCacheInterface
     /**
      * Saves an expression in the cache.
      *
-     * @param string           $key  The cache key
-     * @param ParsedExpression $data A ParsedExpression instance to store in the cache
+     * @param string           $key        The cache key
+     * @param ParsedExpression $expression A ParsedExpression instance to store in the cache
      */
     public function save($key, ParsedExpression $expression);
 
diff --git a/src/Symfony/Component/Process/ProcessPipes.php b/src/Symfony/Component/Process/ProcessPipes.php
@@ -256,7 +256,7 @@ private function readStreams($blocking, $close = false)
         // let's have a look if something changed in streams
         if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? ceil(Process::TIMEOUT_PRECISION * 1E6) : 0)) {
             // if a system call has been interrupted, forget about it, let's try again
-            // otherwise, an error occured, let's reset pipes
+            // otherwise, an error occurred, let's reset pipes
             if (!$this->hasSystemCallBeenInterrupted()) {
                 $this->pipes = array();
             }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class DoctrineTokenProvider implements TokenProviderInterface`
`47`	`47`	`private $conn;`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * new DoctrineTokenProvider for the RemembeMe authentication service`
	`50`	`+ * new DoctrineTokenProvider for the RememberMe authentication service`
`51`	`51`	`*`
`52`	`52`	`* @param \Doctrine\DBAL\Connection $conn`
`53`	`53`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct()`
`39`	`39`	`* This service is shared.`
`40`	`40`	`* This method always returns the same instance of the service.`
`41`	`41`	`*`
`42`		`- * @param boolean $lazyLoad whether to try lazy-loading the service with a proxy`
	`42`	`+ * @param Boolean $lazyLoad whether to try lazy-loading the service with a proxy`
`43`	`43`	`*`
`44`	`44`	`* @return stdClass A stdClass instance.`
`45`	`45`	`*/`
`@@ -109,6 +109,8 @@ public function __set($name, $value)`
`109`	`109`
`110`	`110`	`/**`
`111`	`111`	`* @param string $name`
	`112`	`+ *`
	`113`	`+ * @return Boolean`
`112`	`114`	`*/`
`113`	`115`	`public function __isset($name)`
`114`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function fileExcerpt($file, $line)`
`125`	`125`	`if (extension_loaded('fileinfo')) {`
`126`	`126`	`$finfo = new \Finfo();`
`127`	`127`
`128`		`- // Check if the file is an application/octet-stream (eg. Phar file) because hightlight_file cannot parse these files`
	`128`	`+ // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files`
`129`	`129`	`if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {`
`130`	`130`	`return;`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ protected function getRawContainer()`
`83`	`83`
`84`	`84`	`protected function getContainer()`
`85`	`85`	`{`
`86`		`- $containter = $this->getRawContainer();`
`87`		`- $containter->compile();`
	`86`	`+ $container = $this->getRawContainer();`
	`87`	`+ $container->compile();`
`88`	`88`
`89`		`- return $containter;`
	`89`	`+ return $container;`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function addElement(Node $value, Node $key = null)`
`34`	`34`	`/**`
`35`	`35`	`* Compiles the node to PHP.`
`36`	`36`	`*`
`37`		`- * @param Compiler A Compiler instance`
	`37`	`+ * @param Compiler $compiler A Compiler instance`
`38`	`38`	`*/`
`39`	`39`	`public function compile(Compiler $compiler)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ private function readStreams($blocking, $close = false)`
`256`	`256`	`// let's have a look if something changed in streams`
`257`	`257`	`if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? ceil(Process::TIMEOUT_PRECISION * 1E6) : 0)) {`
`258`	`258`	`// if a system call has been interrupted, forget about it, let's try again`
`259`		`- // otherwise, an error occured, let's reset pipes`
	`259`	`+ // otherwise, an error occurred, let's reset pipes`
`260`	`260`	`if (!$this->hasSystemCallBeenInterrupted()) {`
`261`	`261`	`$this->pipes = array();`
`262`	`262`	`}`