Fixed parser so that square brackets count as delimiters

Author: dantleech

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -184,7 +184,7 @@ protected function tokenize(&$tokens, $token)
         $buffer = '';
         for ($i = 0; $i < strlen($token); $i++) {
             $char = trim(substr($token, $i, 1));
-            if (in_array($char, array('.', ',', '(', ')', '='))) {
+            if (in_array($char, array('[', ']', '.', ',', '(', ')', '='))) {
                 if ($buffer !== '') {
                     $tokens[] = $buffer;
                     $buffer = '';

src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php

@@ -935,9 +935,14 @@ private function fetchTokenWithoutBrackets()
     {
         $token = $this->scanner->fetchNextToken();
 
-        if (substr($token, 0, 1) === '[' && substr($token, -1) === ']') {
-            // Remove brackets around the selector name
-            $token = substr($token, 1, -1);
+        if ($token === '[') {
+            $token = $this->scanner->fetchNextToken();
+            $endDelimiter = $this->scanner->fetchNextToken();
+            if ($endDelimiter !== ']') {
+                throw new InvalidQueryException(sprintf(
+                    'Expected closing square brackets around "%s"', $token
+                ));
+            }
         }
 
         return $token;