Merge branch '3.10.x' into 4.3.x

* 3.10.x:
  feat: improve performance of sql parser

Author: derrabus

.github/workflows/phpunit-sqlite.yml

@@ -24,6 +24,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Remove optional dependencies
+        run: composer remove --no-update --dev doctrine/cache
+        if: ${{ matrix.dependency-versions == 'minimal' }}
+
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:

src/SQL/Parser.php

@@ -9,14 +9,9 @@
 use Doctrine\DBAL\SQL\Parser\Visitor;
 
 use function array_merge;
-use function assert;
-use function current;
 use function implode;
-use function key;
-use function next;
 use function preg_last_error;
 use function preg_match;
-use function reset;
 use function sprintf;
 use function strlen;
 
@@ -47,6 +42,7 @@ final class Parser
     private const OTHER                = '[^' . self::SPECIAL_CHARS . ']+';
 
     private readonly string $sqlPattern;
+    private readonly string $tokenPattern;
 
     public function __construct(bool $mySQLStringEscaping)
     {
@@ -71,7 +67,12 @@ public function __construct(bool $mySQLStringEscaping)
             self::OTHER,
         ]);
 
-        $this->sqlPattern = sprintf('(%s)', implode('|', $patterns));
+        $this->sqlPattern   = sprintf('(%s)', implode('|', $patterns));
+        $this->tokenPattern = '~\\G'
+            . '(?P<named>' . self::NAMED_PARAMETER . ')'
+            . '|(?P<positional>' . self::POSITIONAL_PARAMETER . ')'
+            . '|(?P<other>' . $this->sqlPattern . '|' . self::SPECIAL . ')'
+            . '~s';
     }
 
     /**
@@ -81,40 +82,26 @@ public function __construct(bool $mySQLStringEscaping)
      */
     public function parse(string $sql, Visitor $visitor): void
     {
-        /** @var array<string,callable> $patterns */
-        $patterns = [
-            self::NAMED_PARAMETER => static function (string $sql) use ($visitor): void {
-                $visitor->acceptNamedParameter($sql);
-            },
-            self::POSITIONAL_PARAMETER => static function (string $sql) use ($visitor): void {
-                $visitor->acceptPositionalParameter($sql);
-            },
-            $this->sqlPattern => static function (string $sql) use ($visitor): void {
-                $visitor->acceptOther($sql);
-            },
-            self::SPECIAL => static function (string $sql) use ($visitor): void {
-                $visitor->acceptOther($sql);
-            },
-        ];
-
         $offset = 0;
-
-        while (($handler = current($patterns)) !== false) {
-            if (preg_match('~\G' . key($patterns) . '~s', $sql, $matches, 0, $offset) === 1) {
-                $handler($matches[0]);
-                reset($patterns);
-
-                $offset += strlen($matches[0]);
+        $length = strlen($sql);
+        while ($offset < $length) {
+            if (preg_match($this->tokenPattern, $sql, $matches, 0, $offset) === 1) {
+                $match = $matches[0];
+                if ($matches['named'] !== '') {
+                    $visitor->acceptNamedParameter($match);
+                } elseif ($matches['positional'] !== '') {
+                    $visitor->acceptPositionalParameter($match);
+                } else {
+                    $visitor->acceptOther($match);
+                }
+
+                $offset += strlen($match);
             } elseif (preg_last_error() !== PREG_NO_ERROR) {
                 // @codeCoverageIgnoreStart
                 throw RegularExpressionError::new();
                 // @codeCoverageIgnoreEnd
-            } else {
-                next($patterns);
             }
         }
-
-        assert($offset === strlen($sql));
     }
 
     private function getMySQLStringLiteralPattern(string $delimiter): string