Add more Lexer utils for managing versions

Author: martin-georgiev

ci/rector/config.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\Config\RectorConfig;
 use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
@@ -40,6 +41,9 @@
 
     $rectorConfig->skip([
         RenamePropertyToMatchTypeRector::class,
+        FlipTypeControlToUseExclusiveTypeRector::class => [
+            $basePath.'src/MartinGeorgiev/Utils/DoctrineLexer.php',
+        ],
     ]);
 
     $rectorConfig->importShortClasses(false);

src/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/Cast.php

@@ -4,13 +4,13 @@
 
 namespace MartinGeorgiev\Doctrine\ORM\Query\AST\Functions;
 
-use Doctrine\Common\Lexer\Token;
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\AST\Node;
 use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\TokenType;
+use MartinGeorgiev\Utils\DoctrineLexer;
 use MartinGeorgiev\Utils\DoctrineOrm;
 
 /**
@@ -40,16 +40,11 @@ public function parse(Parser $parser): void
         $parser->match($shouldUseLexer ? Lexer::T_IDENTIFIER : TokenType::T_IDENTIFIER);
 
         $lexer = $parser->getLexer();
-        $token = $lexer->token;
-        if (!$token instanceof Token) {
+        $type = DoctrineLexer::getTokenValue($lexer);
+        if ($type === null) {
             return;
         }
 
-        if (!\is_string($token->value)) {
-            return;
-        }
-
-        $type = $token->value;
         if ($lexer->isNextToken($shouldUseLexer ? Lexer::T_OPEN_PARENTHESIS : TokenType::T_OPEN_PARENTHESIS)) {
             $parser->match($shouldUseLexer ? Lexer::T_OPEN_PARENTHESIS : TokenType::T_OPEN_PARENTHESIS);
             $parameter = $parser->Literal();

src/MartinGeorgiev/Utils/DoctrineLexer.php

@@ -36,4 +36,23 @@ public static function getLookaheadType(Lexer $lexer)
         // @phpstan-ignore-next-line
         return $lexer->lookahead?->type;
     }
+
+    /**
+     * @return mixed|null
+     */
+    public static function getTokenValue(Lexer $lexer)
+    {
+        if (self::isPre200($lexer)) {
+            // @phpstan-ignore-next-line
+            if ($lexer->token === null) {
+                return null;
+            }
+
+            // @phpstan-ignore-next-line
+            return $lexer->token['value'];
+        }
+
+        // @phpstan-ignore-next-line
+        return $lexer->token?->value;
+    }
 }