Avoid deprecation with doctrine/lexer 2

Author: VincentLanglet

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/orm": "^2.7"
+        "doctrine/orm": "^2.15"
     },
     "require-dev": {
         "doctrine/cache": "^1.11",

src/Query/Mysql/Cast.php

@@ -40,7 +40,7 @@ public function parse(Parser $parser): void
         $parser->match(Lexer::T_AS);
         $parser->match(Lexer::T_IDENTIFIER);
 
-        $type = $parser->getLexer()->token['value'];
+        $type = $parser->getLexer()->token->value;
 
         if ($parser->getLexer()->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
             $parser->match(Lexer::T_OPEN_PARENTHESIS);

src/Query/Mysql/Collate.php

@@ -36,7 +36,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        $this->collation = $lexer->token['value'];
+        $this->collation = $lexer->token->value;
 
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }

src/Query/Mysql/ConcatWs.php

@@ -27,17 +27,17 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        while (count($this->values) < 3 || $lexer->lookahead['type'] == Lexer::T_COMMA) {
+        while (count($this->values) < 3 || $lexer->lookahead->type == Lexer::T_COMMA) {
             $parser->match(Lexer::T_COMMA);
             $peek = $lexer->glimpse();
 
-            $this->values[] = $peek['value'] == '('
+            $this->values[] = $peek->value == '('
                     ? $parser->FunctionDeclaration()
                     : $parser->ArithmeticExpression();
         }
 
-        while ($lexer->lookahead['type'] == Lexer::T_IDENTIFIER) {
-            switch (strtolower($lexer->lookahead['value'])) {
+        while ($lexer->lookahead->type == Lexer::T_IDENTIFIER) {
+            switch (strtolower($lexer->lookahead->value)) {
                 case 'notempty':
                     $parser->match(Lexer::T_IDENTIFIER);
                     $this->notEmpty = true;

src/Query/Mysql/CountIf.php

@@ -26,8 +26,8 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
 
         $lexer = $parser->getLexer();
 
-        while ($lexer->lookahead['type'] == Lexer::T_IDENTIFIER) {
-            switch (strtolower($lexer->lookahead['value'])) {
+        while ($lexer->lookahead->type == Lexer::T_IDENTIFIER) {
+            switch (strtolower($lexer->lookahead->value)) {
                 case 'inverse':
                     $parser->match(Lexer::T_IDENTIFIER);
                     $this->inverse = true;

src/Query/Mysql/Extract.php

@@ -21,7 +21,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
 
         $parser->match(Lexer::T_IDENTIFIER);
         $lexer = $parser->getLexer();
-        $this->unit = $lexer->token['value'];
+        $this->unit = $lexer->token->value;
 
         $parser->match(Lexer::T_IDENTIFIER);
         $this->date = $parser->ArithmeticPrimary();

src/Query/Mysql/Field.php

@@ -28,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
         $lexer = $parser->getLexer();
 
         while (count($this->values) < 1 ||
-            $lexer->lookahead['type'] != Lexer::T_CLOSE_PARENTHESIS) {
+            $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
             $parser->match(Lexer::T_COMMA);
             $this->values[] = $parser->ArithmeticPrimary();
         }

src/Query/Mysql/FromUnixtime.php

@@ -37,7 +37,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
         $this->firstExpression = $parser->ArithmeticPrimary();
 
         // parse second parameter if available
-        if (Lexer::T_COMMA === $lexer->lookahead['type']) {
+        if (Lexer::T_COMMA === $lexer->lookahead->type) {
             $parser->match(Lexer::T_COMMA);
             $this->secondExpression = $parser->ArithmeticPrimary();
         }

src/Query/Mysql/Greatest.php

@@ -28,7 +28,7 @@ public function parse(Parser $parser): void
         $lexer = $parser->getLexer();
 
         while (count($this->values) < 1 ||
-            $lexer->lookahead['type'] != Lexer::T_CLOSE_PARENTHESIS) {
+            $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
             $parser->match(Lexer::T_COMMA);
             $this->values[] = $parser->ArithmeticExpression();
         }

src/Query/Mysql/GroupConcat.php

@@ -45,7 +45,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
         }
 
         if ($lexer->isNextToken(Lexer::T_IDENTIFIER)) {
-            if (strtolower($lexer->lookahead['value']) !== 'separator') {
+            if (strtolower($lexer->lookahead->value) !== 'separator') {
                 $parser->syntaxError('separator');
             }
             $parser->match(Lexer::T_IDENTIFIER);