Fixing tests for brackets

Author: mamazu

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -149,7 +149,9 @@ protected function scan($sql2)
         $stringStartCharacter = false;
         $isEscaped = false;
         $escapedQuotesCount = 0;
-        foreach (\str_split($sql2) as $index => $character) {
+        $splitString = \str_split($sql2);
+        for ($index = 0; $index < count($splitString); $index++) {
+            $character = $splitString[$index];
             if (!$stringStartCharacter && in_array($character, [' ', "\t", "\n"], true)) {
                 if ($currentToken !== '') {
                     $tokens[] = $currentToken;
@@ -165,6 +167,19 @@ protected function scan($sql2)
                 $currentToken = '';
                 continue;
             }
+
+            // Handling the squared brackets in queries
+            if (!$isEscaped && $character === '[') {
+                if ($currentToken !== '') {
+                    $tokens[] = $currentToken;
+                }
+                $stringSize = $this->parseBrackets($sql2, $index);
+                $tokens[] = substr($sql2, $index, $stringSize);
+                // We need to subtract one here because the for loop will automatically increment the index
+                $index += $stringSize - 1;
+                continue;
+            }
+
             $currentToken .= $character;
 
             if (!$isEscaped && in_array($character, ['"', "'"], true)) {
@@ -217,4 +232,11 @@ private function getCharacterAtIndex($string, $index)
 
         return '';
     }
+
+    private function parseBrackets(string $query, int $index): int
+    {
+        $endPosition = strpos($query, ']', $index) + 1;
+
+        return $endPosition - $index;
+    }
 }

tests/PHPCR/Tests/Util/QOM/Sql2ScannerTest.php

@@ -135,9 +135,7 @@ public function testSquareBrackets()
             '(',
             'file',
             ',',
-            '[',
-            '"/home node"',
-            ']',
+            '["/home node"]',
             ')',
         ];
 
@@ -155,8 +153,7 @@ public function testSquareBracketsWithoutQuotes()
             '(',
             'file',
             ',',
-            '[/home',
-            'node]',
+            '[/home node]',
             ')',
         ];