Merge pull request #717 from hackedd/patch-1

Allow query parameters starting with an underscore
doctrine · Jul 29, 2013 · a53fe14 · a53fe14
2 parents 8d13601 + b5394fc
commit a53fe14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Query/Lexer.php b/lib/Doctrine/ORM/Query/Lexer.php
@@ -129,7 +129,7 @@ protected function getCatchablePatterns()
             '[a-z_\\\][a-z0-9_\:\\\]*[a-z0-9_]{1}',
             '(?:[0-9]+(?:[\.][0-9]+)*)(?:e[+-]?[0-9]+)?',
             "'(?:[^']|'')*'",
-            '\?[0-9]*|:[a-z]{1}[a-z0-9_]{0,}'
+            '\?[0-9]*|:[a-z_][a-z0-9_]*'
         );
     }
 

diff --git a/tests/Doctrine/Tests/ORM/Query/LexerTest.php b/tests/Doctrine/Tests/ORM/Query/LexerTest.php
@@ -158,6 +158,15 @@ public function testScannerRecognizesNamedInputParameter()
         $this->assertEquals(':name', $token['value']);
     }
 
+    public function testScannerRecognizesNamedInputParameterStartingWithUnderscore()
+    {
+        $lexer = new Lexer(':_name');
+        $lexer->moveNext();
+        $token = $lexer->lookahead;
+        $this->assertEquals(Lexer::T_INPUT_PARAMETER, $token['type']);
+        $this->assertEquals(':_name', $token['value']);
+    }
+
     public function testScannerTokenizesASimpleQueryCorrectly()
     {
         $dql = "SELECT u FROM My\Namespace\User u WHERE u.name = 'Jack O''Neil'";