fixed lexing expression ending with spaces

symfony · Nov 28, 2013 · 4c0b44e · 4c0b44e
1 parent 8a780a9
commit 4c0b44e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -36,8 +36,10 @@ public function tokenize($expression)
         $end = strlen($expression);
 
         while ($cursor < $end) {
-            while (' ' == $expression[$cursor]) {
+            if (' ' == $expression[$cursor]) {
                 ++$cursor;
+
+                continue;
             }
 
             if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, null, $cursor)) {

diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -30,6 +30,10 @@ public function testTokenize($tokens, $expression)
     public function getTokenizeData()
     {
         return array(
+            array(
+                array(new Token('name', 'a', 3)),
+                '  a  ',
+            ),
             array(
                 array(new Token('name', 'a', 1)),
                 'a',