Better handling of negative indexes (Fixes #15)

FlowCommunications · Mar 4, 2018 · f022281 · f022281
1 parent 5de3d83
commit f022281
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/Flow/JSONPath/Filters/QueryMatchFilter.php b/src/Flow/JSONPath/Filters/QueryMatchFilter.php
@@ -6,7 +6,7 @@
 class QueryMatchFilter extends AbstractFilter
 {
     const MATCH_QUERY_OPERATORS = '
-    @(\.(?<key>\w+)|\[["\'](?<keySquare>.*?)["\']\])
+    @(\.(?<key>\w+)|\[["\']?(?<keySquare>.*?)["\']?\])
     (\s*(?<operator>==|=|<>|!==|!=|>|<)\s*(?<comparisonValue>.+))?
     ';
 

diff --git a/tests/JSONPathTest.php b/tests/JSONPathTest.php
@@ -390,6 +390,48 @@ public function testNegativeIndex()
         $this->assertEquals("Herman Melville", $result[0]['author']);
     }
 
+    public function testQueryAccessWithNumericalIndexes()
+    {
+        $jsonPath = new JSONPath(json_decode('{
+            "result": {
+                "list": [
+                    {
+                        "time": 1477526400,
+                        "o": "11.51000"
+                    },
+                    {
+                        "time": 1477612800,
+                        "o": "11.49870"
+                    }
+                ]
+            }
+        }'));
+
+        $result = $jsonPath->find("$.result.list[?(@.o == \"11.51000\")]");
+
+        $this->assertEquals("11.51000", $result[0]->o);
+
+        $jsonPath = new JSONPath(json_decode('{
+            "result": {
+                "list": [
+                    [
+                        1477526400,
+                        "11.51000"
+                    ],
+                    [
+                        1477612800,
+                        "11.49870"
+                    ]
+                ]
+            }
+        }'));
+
+        $result = $jsonPath->find("$.result.list[?(@[1] == \"11.51000\")]");
+
+        $this->assertEquals("11.51000", $result[0][1]);
+
+    }
+
 
     public function exampleData($asArray = true)
     {