|
@@ -11,6 +11,7 @@ use Doctrine\ORM\Query\Lexer;
|
|
|
use Doctrine\ORM\Query\Parser;
|
|
use Doctrine\ORM\Query\Parser;
|
|
|
use Doctrine\ORM\Query\QueryException;
|
|
use Doctrine\ORM\Query\QueryException;
|
|
|
use Doctrine\ORM\Query\SqlWalker;
|
|
use Doctrine\ORM\Query\SqlWalker;
|
|
|
|
|
+use Doctrine\ORM\Query\TokenType;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* SphericalDistanceFunction ::= "SPHERICAL_DISTANCE" "(" ArithmeticPrimary "," ArithmeticPrimary "," ArithmeticPrimary "," ArithmeticPrimary ")".
|
|
* SphericalDistanceFunction ::= "SPHERICAL_DISTANCE" "(" ArithmeticPrimary "," ArithmeticPrimary "," ArithmeticPrimary "," ArithmeticPrimary ")".
|
|
@@ -42,16 +43,16 @@ class SphericalDistance extends FunctionNode
|
|
|
*/
|
|
*/
|
|
|
public function parse(Parser $parser): void
|
|
public function parse(Parser $parser): void
|
|
|
{
|
|
{
|
|
|
- $parser->match(Lexer::T_IDENTIFIER);
|
|
|
|
|
- $parser->match(Lexer::T_OPEN_PARENTHESIS);
|
|
|
|
|
|
|
+ $parser->match(TokenType::T_IDENTIFIER);
|
|
|
|
|
+ $parser->match(TokenType::T_OPEN_PARENTHESIS);
|
|
|
$this->latitude1 = $parser->ArithmeticPrimary();
|
|
$this->latitude1 = $parser->ArithmeticPrimary();
|
|
|
- $parser->match(Lexer::T_COMMA);
|
|
|
|
|
|
|
+ $parser->match(TokenType::T_COMMA);
|
|
|
$this->longitude1 = $parser->ArithmeticPrimary();
|
|
$this->longitude1 = $parser->ArithmeticPrimary();
|
|
|
- $parser->match(Lexer::T_COMMA);
|
|
|
|
|
|
|
+ $parser->match(TokenType::T_COMMA);
|
|
|
$this->latitude2 = $parser->ArithmeticPrimary();
|
|
$this->latitude2 = $parser->ArithmeticPrimary();
|
|
|
- $parser->match(Lexer::T_COMMA);
|
|
|
|
|
|
|
+ $parser->match(TokenType::T_COMMA);
|
|
|
$this->longitude2 = $parser->ArithmeticPrimary();
|
|
$this->longitude2 = $parser->ArithmeticPrimary();
|
|
|
- $parser->match(Lexer::T_CLOSE_PARENTHESIS);
|
|
|
|
|
|
|
+ $parser->match(TokenType::T_CLOSE_PARENTHESIS);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|