From c08ed75c187c86dd2bde04b1cc0666c73ff6cbdb Mon Sep 17 00:00:00 2001
From: nikic <+@ni-po.com>
Date: Tue, 8 Feb 2011 21:52:55 +0100
Subject: [PATCH] fix some typos

---
 lib/Twig/Lexer.php                      |    4 ++--
 lib/Twig/Loader/Array.php               |    2 +-
 lib/Twig/NodeVisitor/SafeAnalysis.php   |    2 +-
 lib/Twig/Token.php                      |    2 +-
 lib/Twig/TokenParserBrokerInterface.php |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Twig/Lexer.php b/lib/Twig/Lexer.php
index 15147fe..93647f6 100644
--- a/lib/Twig/Lexer.php
+++ b/lib/Twig/Lexer.php
@@ -143,7 +143,7 @@ class Twig_Lexer implements Twig_LexerInterface
 
                 $this->moveCursor(substr($this->code, $this->cursor, $pos - $this->cursor) . $this->options['tag_comment'][1]);
 
-                // mimicks the behavior of PHP by removing the newline that follows instructions if present
+                // mimics the behavior of PHP by removing the newline that follows instructions if present
                 if ("\n" === substr($this->code, $this->cursor, 1)) {
                     ++$this->cursor;
                     ++$this->lineno;
@@ -177,7 +177,7 @@ class Twig_Lexer implements Twig_LexerInterface
             $this->moveCursor($match[0]);
             $this->state = self::STATE_DATA;
 
-            // mimicks the behavior of PHP by removing the newline that follows instructions if present
+            // mimics the behavior of PHP by removing the newline that follows instructions if present
             if ("\n" === substr($this->code, $this->cursor, 1)) {
                 ++$this->cursor;
                 ++$this->lineno;
diff --git a/lib/Twig/Loader/Array.php b/lib/Twig/Loader/Array.php
index 8c8798a..4fbe8b9 100644
--- a/lib/Twig/Loader/Array.php
+++ b/lib/Twig/Loader/Array.php
@@ -12,7 +12,7 @@
 /**
  * Loads a template from an array.
  *
- * When using this loader with a cache mehcanism, you should know that a new cache
+ * When using this loader with a cache mechanism, you should know that a new cache
  * key is generated each time a template content "changes" (the cache key being the
  * source code of the template). If you don't want to see your cache grows out of
  * control, you need to take care of clearing the old cache file by yourself.
diff --git a/lib/Twig/NodeVisitor/SafeAnalysis.php b/lib/Twig/NodeVisitor/SafeAnalysis.php
index 4579f4a..5b1bdb2 100644
--- a/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -45,7 +45,7 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
             // constants are marked safe for all
             $this->setSafe($node, array('all'));
         } elseif ($node instanceof Twig_Node_Expression_Conditional) {
-            // instersect safeness of both operands
+            // intersect safeness of both operands
             $safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3')));
             $this->setSafe($node, $safe);
         } elseif ($node instanceof Twig_Node_Expression_Filter) {
diff --git a/lib/Twig/Token.php b/lib/Twig/Token.php
index f74453e..a581bb2 100644
--- a/lib/Twig/Token.php
+++ b/lib/Twig/Token.php
@@ -39,7 +39,7 @@ class Twig_Token
      *
      * @param integer $type   The type of the token
      * @param string  $value  The token value
-     * @param integer $lineno The line positionl in the source
+     * @param integer $lineno The line position in the source
      */
     public function __construct($type, $value, $lineno)
     {
diff --git a/lib/Twig/TokenParserBrokerInterface.php b/lib/Twig/TokenParserBrokerInterface.php
index 09fee54..3ce8ca2 100644
--- a/lib/Twig/TokenParserBrokerInterface.php
+++ b/lib/Twig/TokenParserBrokerInterface.php
@@ -30,7 +30,7 @@ interface Twig_TokenParserBrokerInterface
     function getTokenParser($tag);
 
     /**
-     * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knowns of.
+     * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
      *
      * @param Twig_ParserInterface $parser A Twig_ParserInterface interface
      */
-- 
1.7.2.5