Simplified logic

+ Updated README

Author: SoftCreatR

README.md

@@ -139,6 +139,10 @@ The original JsonPath implementations is available at [http://code.google.com/p/
 
 Changelog
 ---------
+### 0.7.1
+ - Fixed issues with empty tokens (`['']` and `[""]`)
+ - Fixed TypeError in AccessHelper::keyExists 
+ - Improved QueryTest
 
 ### 0.7.0
 🔻 Breaking changes ahead:

src/JSONPathLexer.php

@@ -29,7 +29,7 @@ class JSONPathLexer
     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_DOUBLE_QUOTES = '\s* " (.+?)? " \s*'; // Eg. "bar"
 
     /**
      * The expression being lexed.
@@ -206,16 +206,10 @@ protected function createToken(string $value): JSONPathToken
             $tokenValue = substr($tokenValue, 2, -1);
 
             $ret = new JSONPathToken(JSONPathToken::T_QUERY_MATCH, $tokenValue);
-        } elseif (preg_match('/^' . static::MATCH_INDEX_IN_SINGLE_QUOTES . '$/xu', $tokenValue, $matches)) {
-            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)) {
+        } elseif (
+            preg_match('/^' . static::MATCH_INDEX_IN_SINGLE_QUOTES . '$/xu', $tokenValue, $matches) ||
+            preg_match('/^' . static::MATCH_INDEX_IN_DOUBLE_QUOTES . '$/xu', $tokenValue, $matches)
+        ) {
             if (isset($matches[1])) {
                 $tokenValue = $matches[1];
                 $tokenValue = trim($tokenValue);