From 08a3423ce20a269db10bf3f05ace10e2ea4926c0 Mon Sep 17 00:00:00 2001 From: Lukasz Cybula Date: Mon, 5 Nov 2012 14:47:41 +0100 Subject: [PATCH] CS fixes --- lib/Doctrine/ORM/Query/Parser.php | 5 +++-- lib/Doctrine/ORM/Query/TreeWalkerChain.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index a205eb71f..d057ba754 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -358,6 +358,7 @@ class Parser default: $treeWalkerChain->walkSelectStatement($AST); } + $this->queryComponents = $treeWalkerChain->getQueryComponents(); } @@ -1751,7 +1752,7 @@ class Parser * NewObjectArg ::= ScalarExpression * * @TODO - Maybe you should support other expressions and nested "new" operator - * + * * @return \Doctrine\ORM\Query\AST\SimpleSelectExpression */ public function NewObjectArg() @@ -2094,7 +2095,7 @@ class Parser case ($lookaheadType === Lexer::T_NEW): $expression = $this->NewObjectExpression(); break; - + default: $this->syntaxError( 'IdentificationVariable | ScalarExpression | AggregateExpression | FunctionDeclaration | PartialObjectExpression | "(" Subselect ")" | CaseExpression', diff --git a/lib/Doctrine/ORM/Query/TreeWalkerChain.php b/lib/Doctrine/ORM/Query/TreeWalkerChain.php index 72d087824..f20413c40 100644 --- a/lib/Doctrine/ORM/Query/TreeWalkerChain.php +++ b/lib/Doctrine/ORM/Query/TreeWalkerChain.php @@ -94,6 +94,7 @@ class TreeWalkerChain implements TreeWalker { foreach ($this->_walkers as $walker) { $walker->walkSelectStatement($AST); + $this->_queryComponents = $walker->getQueryComponents(); } }