From 097840dc935e1cfbc93fc673be077a8fe67e8e52 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 27 Aug 2014 01:56:11 +0200 Subject: [PATCH] Allowing expression in `COUNT()` DQL aggregation functions --- lib/Doctrine/ORM/Query/Parser.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index c64e731c6..ab47121ee 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -2962,9 +2962,7 @@ class Parser $isDistinct = true; } - $pathExp = ($lookaheadType === Lexer::T_COUNT) - ? $this->SingleValuedPathExpression() - : $this->SimpleArithmeticExpression(); + $pathExp = $this->SimpleArithmeticExpression(); $this->match(Lexer::T_CLOSE_PARENTHESIS);