Merge pull request #4 from Skyscanner/length_re_wrong

Bug fix in `.length` regex. Minor code cleanup.
Galbar · Dec 2, 2016 · dbb9140 · dbb9140
2 parents 14c8fb0 + 6054cb1
commit dbb9140
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 Changelog
 =========
+0.7.3
+-----
+* Bug fix in `.length` regex.
+* Minor code cleanup.
+
+0.7.2
+-----
+* Documentation now properly defines what a variable name is.
+* Dependencies are now properly defined for older PHP versions.
+
 0.7.1
 -----
 * Bug fix when accessing an array with a negative index. It now behaves as expected.

diff --git a/src/Skyscanner/JsonPath/JsonObject.php b/src/Skyscanner/JsonPath/JsonObject.php
@@ -115,7 +115,7 @@ class JsonObject
     // Array expressions
     const RE_ARRAY_INTERVAL = '/^(?:(-?\d*:-?\d*)|(-?\d*:-?\d*:-?\d*))$/';
     const RE_INDEX_LIST = '/^(-?\d+)(\s*,\s*-?\d+)*$/';
-    const RE_LENGTH = '/^(.*).length$/';
+    const RE_LENGTH = '/^(.*)\.length$/';
 
     // Object expression
     const RE_CHILD_NAME_LIST = '/^(:?([a-zA-Z\_\$][\w\$]*?|".*?"|\'.*?\')(\s*,\s*([a-zA-Z\_\$][\w\$]*|".*?"|\'.*?\'))*)$/';
@@ -477,8 +477,7 @@ private function booleanExpressionAnds(&$jsonObject, $expression)
                 if ($result !== false) {
                     return false;
                 }
-            }
-            else {
+            } else {
                 if ($result === false) {
                     return false;
                 }
@@ -663,7 +662,6 @@ function($x) use ($createInexistent, $jsonObject) {
 
     private function opRecursiveSelector(&$jsonObject, $childName, &$result)
     {
-        //$result[] = &$jsonObject;
         $this->opChildName($jsonObject, $childName, $result);
         if (is_array($jsonObject)) {
             foreach ($jsonObject as &$item) {