From d3444076367c27d3bd41bd0cffe6432f5fa92cd5 Mon Sep 17 00:00:00 2001
From: Stefan Klug <klug.stefan@gmx.de>
Date: Fri, 7 Sep 2012 11:52:18 +0200
Subject: [PATCH 1/4] added test case

---
 tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
index 1f0445c08..f71c5c7f1 100644
--- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
@@ -100,6 +100,11 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase
         $this->assertValidDQL('SELECT COUNT(u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u');
     }
 
+    public function testMultipleParenthesisInSelect()
+    {
+        $this->assertValidDQL('SELECT (((u.id))) as v FROM Doctrine\Tests\Models\CMS\CmsUser u');
+    }
+
     public function testDuplicatedAliasInAggregateFunction()
     {
         $this->assertInvalidDQL('SELECT COUNT(u.id) AS num, SUM(u.id) AS num FROM Doctrine\Tests\Models\CMS\CmsUser u');

From 6ccf7a7ac704242a5adef43695e4f35c2f9542c0 Mon Sep 17 00:00:00 2001
From: Stefan Klug <klug.stefan@gmx.de>
Date: Tue, 18 Sep 2012 11:57:39 +0200
Subject: [PATCH 2/4] fixed Parser which incorrectly treated ((( as function

---
 lib/Doctrine/ORM/Query/Parser.php | 64 ++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 0b9bb5bd3..3fccca1d1 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -507,13 +507,14 @@ class Parser
      */
     private function isFunction()
     {
-        $peek     = $this->lexer->peek();
-        $nextpeek = $this->lexer->peek();
+        $lookaheadType = $this->lexer->lookahead['type'];
+        $peek          = $this->lexer->peek();
+        $nextpeek      = $this->lexer->peek();
 
         $this->lexer->resetPeek();
 
         // We deny the COUNT(SELECT * FROM User u) here. COUNT won't be considered a function
-        return ($peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT);
+        return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT);
     }
 
     /**
@@ -1786,9 +1787,10 @@ class Parser
     public function ScalarExpression()
     {
         $lookahead = $this->lexer->lookahead['type'];
+        $peek      = $this->lexer->glimpse();
 
-        switch ($lookahead) {
-            case Lexer::T_IDENTIFIER:
+        switch (true) {
+            case ($lookahead === Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_DOT):
                 $this->lexer->peek(); // lookahead => '.'
                 $this->lexer->peek(); // lookahead => token after '.'
                 $peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
@@ -1800,47 +1802,55 @@ class Parser
 
                 return $this->StateFieldPathExpression();
 
-            case Lexer::T_INTEGER:
-            case Lexer::T_FLOAT:
+            case ($lookahead === Lexer::T_INTEGER):
+            case ($lookahead === Lexer::T_FLOAT):
                 return $this->SimpleArithmeticExpression();
 
-            case Lexer::T_STRING:
+            case ($lookahead === Lexer::T_STRING):
                 return $this->StringPrimary();
 
-            case Lexer::T_TRUE:
-            case Lexer::T_FALSE:
+            case ($lookahead === Lexer::T_TRUE):
+            case ($lookahead === Lexer::T_FALSE):
                 $this->match($lookahead);
 
                 return new AST\Literal(AST\Literal::BOOLEAN, $this->lexer->token['value']);
 
-            case Lexer::T_INPUT_PARAMETER:
+            case ($lookahead === Lexer::T_INPUT_PARAMETER):
                 return $this->InputParameter();
 
-            case Lexer::T_CASE:
-            case Lexer::T_COALESCE:
-            case Lexer::T_NULLIF:
+            case ($lookahead === Lexer::T_CASE):
+            case ($lookahead === Lexer::T_COALESCE):
+            case ($lookahead === Lexer::T_NULLIF):
                 // Since NULLIF and COALESCE can be identified as a function,
                 // we need to check if before check for FunctionDeclaration
                 return $this->CaseExpression();
 
-            default:
-                if ( ! ($this->isFunction() || $this->isAggregateFunction($lookahead))) {
-                    $this->syntaxError();
-                }
-
-                // We may be in an ArithmeticExpression (find the matching ")" and inspect for Math operator)
+            case ($this->isFunction()):
                 $this->lexer->peek(); // "("
-                $peek = $this->peekBeyondClosingParenthesis();
 
-                if ($this->isMathOperator($peek)) {
-                    return $this->SimpleArithmeticExpression();
+                switch (true) {
+                    case ($this->isMathOperator($this->peekBeyondClosingParenthesis())):
+                        // SUM(u.id) + COUNT(u.id)
+                        return $this->SimpleArithmeticExpression();
+                        break;
+
+                    case ($this->isAggregateFunction($this->lexer->lookahead['type'])):
+                        return $this->AggregateExpression();
+                        break;
+
+                    default:
+                        // IDENTITY(u)
+                        return $this->FunctionDeclaration();
+                        break;
                 }
 
-                if ($this->isAggregateFunction($this->lexer->lookahead['type'])) {
-                    return $this->AggregateExpression();
-                }
+                break;
 
-                return $this->FunctionDeclaration();
+            case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
+                return $this->SimpleArithmeticExpression();
+
+            default:
+                $this->syntaxError();
         }
     }
 

From 1e1f34f9cb733a708e57fb8e5d5797a011a663af Mon Sep 17 00:00:00 2001
From: Stefan Klug <klug.stefan@gmx.de>
Date: Sat, 22 Sep 2012 17:23:49 +0200
Subject: [PATCH 3/4] cleanup ScalarExpression _isFunction doesn't exclude
 subselects anymore

---
 lib/Doctrine/ORM/Query/Parser.php | 37 ++++++++++++++-----------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 3fccca1d1..16b8beb0b 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -513,8 +513,7 @@ class Parser
 
         $this->lexer->resetPeek();
 
-        // We deny the COUNT(SELECT * FROM User u) here. COUNT won't be considered a function
-        return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS && $nextpeek['type'] !== Lexer::T_SELECT);
+        return ($lookaheadType >= Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_OPEN_PARENTHESIS);
     }
 
     /**
@@ -1790,18 +1789,6 @@ class Parser
         $peek      = $this->lexer->glimpse();
 
         switch (true) {
-            case ($lookahead === Lexer::T_IDENTIFIER && $peek['type'] === Lexer::T_DOT):
-                $this->lexer->peek(); // lookahead => '.'
-                $this->lexer->peek(); // lookahead => token after '.'
-                $peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
-                $this->lexer->resetPeek();
-
-                if ($this->isMathOperator($peek)) {
-                    return $this->SimpleArithmeticExpression();
-                }
-
-                return $this->StateFieldPathExpression();
-
             case ($lookahead === Lexer::T_INTEGER):
             case ($lookahead === Lexer::T_FLOAT):
                 return $this->SimpleArithmeticExpression();
@@ -1822,9 +1809,13 @@ class Parser
             case ($lookahead === Lexer::T_COALESCE):
             case ($lookahead === Lexer::T_NULLIF):
                 // Since NULLIF and COALESCE can be identified as a function,
-                // we need to check if before check for FunctionDeclaration
+                // we need to check these before checking for FunctionDeclaration
                 return $this->CaseExpression();
 
+            case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
+                return $this->SimpleArithmeticExpression();
+
+            //this check must be done before checking for a filed path expression
             case ($this->isFunction()):
                 $this->lexer->peek(); // "("
 
@@ -1832,22 +1823,28 @@ class Parser
                     case ($this->isMathOperator($this->peekBeyondClosingParenthesis())):
                         // SUM(u.id) + COUNT(u.id)
                         return $this->SimpleArithmeticExpression();
-                        break;
 
                     case ($this->isAggregateFunction($this->lexer->lookahead['type'])):
                         return $this->AggregateExpression();
-                        break;
 
                     default:
                         // IDENTITY(u)
                         return $this->FunctionDeclaration();
-                        break;
                 }
 
                 break;
+            //it is no function, so it must be a field path
+            case ($lookahead === Lexer::T_IDENTIFIER):
+                $this->lexer->peek(); // lookahead => '.'
+                $this->lexer->peek(); // lookahead => token after '.'
+                $peek = $this->lexer->peek(); // lookahead => token after the token after the '.'
+                $this->lexer->resetPeek();
 
-            case ($lookahead === Lexer::T_OPEN_PARENTHESIS):
-                return $this->SimpleArithmeticExpression();
+                if ($this->isMathOperator($peek)) {
+                    return $this->SimpleArithmeticExpression();
+                }
+
+                return $this->StateFieldPathExpression();
 
             default:
                 $this->syntaxError();

From bf54c22cd9ec731c93fb2ef2af2a2a12ee9a3e50 Mon Sep 17 00:00:00 2001
From: Stefan Klug <klug.stefan@gmx.de>
Date: Sat, 22 Sep 2012 17:28:27 +0200
Subject: [PATCH 4/4] removed unneded variable

---
 lib/Doctrine/ORM/Query/Parser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index 16b8beb0b..f6994c05b 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -509,7 +509,6 @@ class Parser
     {
         $lookaheadType = $this->lexer->lookahead['type'];
         $peek          = $this->lexer->peek();
-        $nextpeek      = $this->lexer->peek();
 
         $this->lexer->resetPeek();