Add support for variable names starting with numbers in the dot-notation

Author: Galbar

README.md

@@ -97,7 +97,7 @@ JsonPath Language
 =================
 This library implements the following specification:
 ```
-var_name¹   = /^\.([\p{L}\_\$][\w\-\$]*|\*)(.*)/u
+var_name¹   = /^\.([\p{L}\p{N}\_\$][\p{L}\p{N}\_\-\$]*|\*)(.*)/u
 number      = ([0-9]+(\.[0-9]*) | ([0-9]*\.[0-9]+))
 string      = ('\''.*?'\'' | '"'.*?'"')
 boolean     = ('true' | 'false')
@@ -128,7 +128,9 @@ length      = (jsonpath | childpath) '.length'
 in_array    = value 'in' '[' value (',' value)* ']'
 ```
 
-¹`var_name`: the regexp roughly translates to "any valid JavaScript variable name".
+¹`var_name`: the regex roughly translates to "any valid JavaScript variable
+name", plus some quirks such as names starting with numbers or containing
+dashes (`-`).
 
 ### Limitations on the specification:  
 * The jsonpath inside _value_ cannot contain `or`, `and` or any comparator.

src/Galbar/JsonPath/Language/Regex.php

@@ -23,7 +23,7 @@ class Regex
     const ROOT_OBJECT = '/^\$(.*)/';
 
     // Child regex
-    const CHILD_NAME = '/^\.([\p{L}\_\$][\w\-\$]*|\*)(.*)/u';
+    const CHILD_NAME = '/^\.([\p{L}\p{N}\_\$][\p{L}\p{N}\_\-\$]*|\*)(.*)/u';
     const RECURSIVE_SELECTOR = '/^\.\.(.+)/u';
 
     // Array expressions
@@ -32,7 +32,7 @@ class Regex
     const LENGTH = '/^(.*)\.length$/';
 
     // Object expression
-    const CHILD_NAME_LIST = '/^(?:([\w\_\$^\d][\w\-\$]*?|".*?"|\'.*?\')(\s*,\s*([\w\_\$^\d][\w\-\$]*|".*?"|\'.*?\'))*)$/u';
+    const CHILD_NAME_LIST = '/^(?:([\p{L}\p{N}\_\$][\p{L}\p{N}\_\-\$]*|".*?"|\'.*?\')(\s*,\s*([\p{L}\p{N}\_\$][\p{L}\p{N}\_\-\$]*|".*?"|\'.*?\'))*)$/u';
 
     // Conditional expressions
     const EXPR_STRING = '/^(?:\'(.*)\'|"(.*)")$/';

tests/Galbar/JsonPath/JsonObjectIssue37Test.php

@@ -27,21 +27,12 @@
  */
 class JsonObjectIssue37Test extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * This library explicitly only supports valid JavaScript variable names with the dot notation.
-     *
-     * This is not a bug but a feature
-     */
     public function testCase1()
     {
         $jsonObject = new JsonObject('{"a": "first", "2": "second", "b": "third"}');
-        $exception = null;
-        try {
-            $jsonObject->get('$.2');
-        } catch (InvalidJsonPathException $e) {
-            $exception = $e;
-        }
-        $this->assertEquals($exception->getMessage(), "Error in JSONPath near '.2'");
+        $result = $jsonObject->get('$.2');
+        $expected = ["second"];
+        $this->assertEquals($expected, $result);
     }
 
     /**

tests/Galbar/JsonPath/JsonObjectTest.php

@@ -1172,8 +1172,7 @@ public function testParsingErrorsProvider()
             array("$.store.book[?(@.title in ['foo')]", "[?(@.title in ['foo')]"),
             array("$.store.book[?(@.title in 'foo'])]", "[?(@.title in 'foo'])]"),
             array("$.store.book[?(@.title in 'foo')]", " in 'foo'"),
-            array("$.store.book[?(@.title ['foo'])]", " ['foo']"),
-            array("$.2", ".2"),
+            array("$.store.book[?(@.title ['foo'])]", " ['foo']")
         );
     }