[POC] usage of new TokenType

beberlei · Feb 6, 2024 · a5fba21 · a5fba21
1 parent 1f307bb
commit a5fba21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,14 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/orm": "^2.15 || ^3.0"
+        "doctrine/orm": "dev-feature/token-type-bridge"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/connorhu/doctrine2"
+        }
+    ],
     "require-dev": {
         "doctrine/annotations": "^1.14 || ^2",
         "doctrine/coding-standard": "^9.0.2 || ^12.0",

diff --git a/src/Query/Mysql/Acos.php b/src/Query/Mysql/Acos.php
@@ -3,7 +3,6 @@
 namespace DoctrineExtensions\Query\Mysql;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
-use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\TokenType;
@@ -23,13 +22,11 @@ public function getSql(SqlWalker $sqlWalker): string
 
     public function parse(Parser $parser): void
     {
-        $orm3 = class_exists(TokenType::class);
-
-        $parser->match($orm3 ? TokenType::T_IDENTIFIER : Lexer::T_IDENTIFIER);
-        $parser->match($orm3 ? TokenType::T_OPEN_PARENTHESIS : Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
 
         $this->arithmeticExpression = $parser->SimpleArithmeticExpression();
 
-        $parser->match($orm3 ? TokenType::T_CLOSE_PARENTHESIS : Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }