fix: add support for Lexer v1 (allowed by ORM < v2.15)

Author: martin-georgiev

.github/workflows/ci.yml

@@ -11,17 +11,25 @@ permissions:
 
 jobs:
   tests:
-    name: "PHP ${{ matrix.php }} + Doctrine ORM ${{ matrix.doctrine-orm }}"
+    name: "PHP ${{ matrix.php }} + Doctrine ORM ${{ matrix.doctrine-orm }} + Doctrine Lexer ${{ matrix.doctrine-lexer }}"
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         php: ['8.1', '8.2', '8.3', '8.4']
-        doctrine-orm: ['2.14', '3.0', 'latest']
+        doctrine-lexer: ['2.1', '3.0', 'latest']
+        doctrine-orm: ['2.14', '2.18', '3.0', 'latest']
         include:
+          - doctrine-orm: '2.14'
+            doctrine-lexer: '1.2'
           - php: '8.4'
             calculate-code-coverage: true
+        exclude:
+          - doctrine-orm: '2.14'
+            doctrine-lexer: '3.0'
+          - doctrine-orm: '3.0'
+            doctrine-lexer: '2.1'
 
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -46,10 +54,24 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-php-
 
-    - name: Install composer dependencies
+    - name: Install Doctrine Lexer dependency
+      run: |
+        if [ "${{ matrix.doctrine-lexer }}" == "1.2" ]; then
+          composer require doctrine/lexer "~1.2" --dev --prefer-dist --no-interaction --no-progress
+        elif [ "${{ matrix.doctrine-lexer }}" == "2.1" ]; then
+          composer require doctrine/lexer "~2.1" --dev --prefer-dist --no-interaction --no-progress
+        elif [ "${{ matrix.doctrine-lexer }}" == "3.0" ]; then
+          composer require doctrine/lexer "~3.0" --dev --prefer-dist --no-interaction --no-progress
+        else
+          composer update --prefer-dist --no-interaction --no-progress
+        fi
+
+    - name: Install Doctrine ORM dependency
       run: |
         if [ "${{ matrix.doctrine-orm }}" == "2.14" ]; then
           composer require doctrine/orm "~2.14" --prefer-dist --no-interaction --no-progress
+        elif [ "${{ matrix.doctrine-orm }}" == "2.18" ]; then
+          composer require doctrine/orm "~2.18" --prefer-dist --no-interaction --no-progress
         elif [ "${{ matrix.doctrine-orm }}" == "3.0" ]; then
           composer require doctrine/orm "~3.0" --prefer-dist --no-interaction --no-progress
         else

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

@@ -11,6 +11,7 @@
 use Doctrine\ORM\Query\TokenType;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\InvalidArgumentForVariadicFunctionException;
 use MartinGeorgiev\Doctrine\ORM\Query\AST\Functions\Exception\ParserException;
+use MartinGeorgiev\Utils\DoctrineLexer;
 use MartinGeorgiev\Utils\DoctrineOrm;
 
 /**
@@ -30,24 +31,24 @@ protected function feedParserWithNodes(Parser $parser): void
         try {
             // @phpstan-ignore-next-line
             $this->nodes[] = $parser->{$this->commonNodeMapping}();
-            if ($lexer->lookahead?->type === null) {
+            $lookaheadType = DoctrineLexer::getLookaheadType($lexer);
+            if ($lookaheadType === null) {
                 throw ParserException::missingLookaheadType();
             }
         } catch (\Throwable $throwable) {
             throw ParserException::withThrowable($throwable);
         }
 
-        $aheadType = $lexer->lookahead->type;
         $shouldUseLexer = DoctrineOrm::isPre219();
 
-        while (($shouldUseLexer ? Lexer::T_CLOSE_PARENTHESIS : TokenType::T_CLOSE_PARENTHESIS) !== $aheadType) {
-            if (($shouldUseLexer ? Lexer::T_COMMA : TokenType::T_COMMA) === $aheadType) {
+        while (($shouldUseLexer ? Lexer::T_CLOSE_PARENTHESIS : TokenType::T_CLOSE_PARENTHESIS) !== $lookaheadType) {
+            if (($shouldUseLexer ? Lexer::T_COMMA : TokenType::T_COMMA) === $lookaheadType) {
                 $parser->match($shouldUseLexer ? Lexer::T_COMMA : TokenType::T_COMMA);
                 // @phpstan-ignore-next-line
                 $this->nodes[] = $parser->{$this->commonNodeMapping}();
             }
 
-            $aheadType = $lexer->lookahead->type;
+            $lookaheadType = DoctrineLexer::getLookaheadType($lexer);
         }
 
         $this->validateArguments($this->nodes);

src/MartinGeorgiev/Utils/DoctrineLexer.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MartinGeorgiev\Utils;
+
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * @internal
+ */
+final class DoctrineLexer
+{
+    public static function isPre200(Lexer $lexer): bool
+    {
+        // @phpstan-ignore-next-line
+        return \is_array($lexer->lookahead);
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public static function getLookaheadType(Lexer $lexer)
+    {
+        if (self::isPre200($lexer)) {
+            // @phpstan-ignore-next-line
+            return $lexer->lookahead['type'];
+        }
+
+        // @phpstan-ignore-next-line
+        return $lexer->lookahead?->type;
+    }
+}