Updated QueryTest

In some cases, the consensus is just disordered, while the actual result is correct.
Let's perform a canonicalized assert in these cases.
There might be still some false positives (e.g. multidimensional comparisons), but that's okay, I guess.
Maybe, we can also find a way around that in the future.

+ Fixed empty string tokens ([''] and [""]) in Lexer

Resolves #9
Resolves #11
Resolves #12
Resolves #13
Resolves #14
Resolves #16
Resolves #18
Resolves #19
Resolves #21

Author: SoftCreatR

src/JSONPathLexer.php

@@ -28,8 +28,8 @@ class JSONPathLexer
     public const MATCH_SLICE = '[-\d:]+ | :'; // Eg. [0:2:1]
     public const MATCH_QUERY_RESULT = '\s* \( .+? \) \s*'; // Eg. ?(@.length - 1)
     public const MATCH_QUERY_MATCH = '\s* \?\(.+?\) \s*'; // Eg. ?(@.foo = "bar")
-    public const MATCH_INDEX_IN_SINGLE_QUOTES = '\s* \' (.+?) \' \s*'; // Eg. 'bar'
-    public const MATCH_INDEX_IN_DOUBLE_QUOTES = '\s* " (.+?) " \s*'; // Eg. 'bar'
+    public const MATCH_INDEX_IN_SINGLE_QUOTES = '\s* \' (.+?)? \' \s*'; // Eg. 'bar'
+    public const MATCH_INDEX_IN_DOUBLE_QUOTES = '\s* " (.+?)? " \s*'; // Eg. 'bar'
 
     /**
      * The expression being lexed.
@@ -207,13 +207,21 @@ protected function createToken(string $value): JSONPathToken
 
             $ret = new JSONPathToken(JSONPathToken::T_QUERY_MATCH, $tokenValue);
         } elseif (preg_match('/^' . static::MATCH_INDEX_IN_SINGLE_QUOTES . '$/xu', $tokenValue, $matches)) {
-            $tokenValue = $matches[1];
-            $tokenValue = trim($tokenValue);
+            if (isset($matches[1])) {
+                $tokenValue = $matches[1];
+                $tokenValue = trim($tokenValue);
+            } else {
+                $tokenValue = '';
+            }
 
             $ret = new JSONPathToken(JSONPathToken::T_INDEX, $tokenValue);
         } elseif (preg_match('/^' . static::MATCH_INDEX_IN_DOUBLE_QUOTES . '$/xu', $tokenValue, $matches)) {
-            $tokenValue = $matches[1];
-            $tokenValue = trim($tokenValue);
+            if (isset($matches[1])) {
+                $tokenValue = $matches[1];
+                $tokenValue = trim($tokenValue);
+            } else {
+                $tokenValue = '';
+            }
 
             $ret = new JSONPathToken(JSONPathToken::T_INDEX, $tokenValue);
         }

tests/QueryTest.php

@@ -43,6 +43,7 @@ public function testQueries(
         string $consensus,
         bool $skip = false
     ): void {
+        $results = null;
         $query = ucwords(str_replace('_', ' ', $id));
         $url = sprintf('https://cburgmer.github.io/json-path-comparison/results/%s', $id);
 
@@ -66,11 +67,23 @@ public function testQueries(
 
             self::assertEquals($consensus, $results);
         } catch (ExpectationFailedException $e) {
-            $e = $e->getComparisonFailure();
+            try {
+                // In some cases, the consensus is just disordered, while
+                // the actual result is correct. Let's perform a canonicalized
+                // assert in these cases. There might be still some false positives
+                // (e.g. multidimensional comparisons), but that's okay, I guess. Maybe,
+                // we can also find a way around that in the future.
+                $results = json_decode($results, true);
+                $consensus = json_decode($consensus, true);
 
-            fwrite(STDERR, "==========================\n");
-            fwrite(STDERR, "Query: {$query}\n\n{$e->toString()}\nMore information: $url\n");
-            fwrite(STDERR, "==========================\n\n");
+                self::assertEqualsCanonicalizing($consensus, $results);
+            } catch (ExpectationFailedException $f) {
+                $e = $e->getComparisonFailure();
+
+                fwrite(STDERR, "==========================\n");
+                fwrite(STDERR, "Query: {$query}\n\n{$e->toString()}\nMore information: $url\n");
+                fwrite(STDERR, "==========================\n\n");
+            }
         } catch (JSONPathException $e) {
             fwrite(STDERR, "==========================\n");
             fwrite(STDERR, "Query: {$query}\n\n{$e->getMessage()}\n");