RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 23:26:04 +03:00
Code Issues Projects Releases Wiki Activity

[Query] removed unused local variables in Parser class.

Browse Source
This commit is contained in:
Hugo Hamon 2012-01-12 19:52:32 +01:00 committed by Benjamin Eberlei
parent 43eebe1a8b
commit 5a1c1e55ef
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Query/Parser.php
View File

@ -601,7 +601,7 @@ class Parser
// Check if queryComponent points to an AbstractSchemaName or a ResultVariable // Check if queryComponent points to an AbstractSchemaName or a ResultVariable
if ( ! isset($qComp['resultVariable'])) { if ( ! isset($qComp['resultVariable'])) {
$this->semanticalError( $this->semanticalError(
"'$identVariable' does not point to a ResultVariable.", $deferredItem['token'] "'$resultVariable' does not point to a ResultVariable.", $deferredItem['token']
); );
} }
@ -652,8 +652,8 @@ class Parser
$assoc = $class->associationMappings[$field]; $assoc = $class->associationMappings[$field];
$fieldType = ($assoc['type'] & ClassMetadata::TO_ONE) $fieldType = ($assoc['type'] & ClassMetadata::TO_ONE)
? AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION ? AST\PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION
: AST\PathExpression::TYPE_COLLECTION_VALUED_ASSOCIATION; : AST\PathExpression::TYPE_COLLECTION_VALUED_ASSOCIATION;
} }
// Validate if PathExpression is one of the expected types // Validate if PathExpression is one of the expected types
@ -700,7 +700,7 @@ class Parser
$foundRootEntity = false; $foundRootEntity = false;
foreach ($this->_identVariableExpressions AS $dqlAlias => $expr) { foreach ($this->_identVariableExpressions as $dqlAlias => $expr) {
if (isset($this->_queryComponents[$dqlAlias]) && $this->_queryComponents[$dqlAlias]['parent'] === null) { if (isset($this->_queryComponents[$dqlAlias]) && $this->_queryComponents[$dqlAlias]['parent'] === null) {
$foundRootEntity = true; $foundRootEntity = true;
} }
@ -905,7 +905,6 @@ class Parser
*/ */
public function JoinAssociationPathExpression() public function JoinAssociationPathExpression()
{ {
$token = $this->_lexer->lookahead;
$identVariable = $this->IdentificationVariable(); $identVariable = $this->IdentificationVariable();
if ( ! isset($this->_queryComponents[$identVariable])) { if ( ! isset($this->_queryComponents[$identVariable])) {
@ -941,7 +940,6 @@ class Parser
*/ */
public function PathExpression($expectedTypes) public function PathExpression($expectedTypes)
{ {
$token = $this->_lexer->lookahead;
$identVariable = $this->IdentificationVariable(); $identVariable = $this->IdentificationVariable();
$field = null; $field = null;
@ -1451,7 +1449,7 @@ class Parser
*/ */
public function SubselectIdentificationVariableDeclaration() public function SubselectIdentificationVariableDeclaration()
{ {
$glimpse = $this->_lexer->glimpse(); $this->_lexer->glimpse();
/* NOT YET IMPLEMENTED! /* NOT YET IMPLEMENTED!
@ -2743,7 +2741,7 @@ class Parser
*/ */
public function ComparisonExpression() public function ComparisonExpression()
{ {
$peek = $this->_lexer->glimpse(); $this->_lexer->glimpse();
$leftExpr = $this->ArithmeticExpression(); $leftExpr = $this->ArithmeticExpression();
$operator = $this->ComparisonOperator(); $operator = $this->ComparisonOperator();