MINOR: Improved range of accepted JSONPath expressions in JSONText::i…

…sValidExpression() including test cases.
phptek · Jul 15, 2016 · 25699d5 · 25699d5
1 parent c121e31
commit 25699d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/code/models/fieldtypes/JSONText.php b/code/models/fieldtypes/JSONText.php
@@ -553,7 +553,7 @@ public function isValidOperator($operator)
      */
     public function isValidExpression($expression)
     {
-        return (bool) preg_match("#^\\$\.#", $expression);
+        return (bool) preg_match("#^(\\*|\[\d:\d:\d\]|\\$\.+[^\d]+)#", $expression);
     }
 
     /**

diff --git a/tests/JSONTextTest.php b/tests/JSONTextTest.php
@@ -12,15 +12,21 @@ class JSONTextTest extends SapphireTest
 {
     /**
      * @todo There are a ton more permutations of a JSONPath regex
-     * See the walk() method in JSONStore
+     * See the trace() method in JSONPath for more examples to work from
      */
     public function testIsValidExpression()
     {
         $field = JSONText::create('MyJSON');
 
         $this->assertTrue($field->isValidExpression('$..'));
+        $this->assertTrue($field->isValidExpression('*'));
         $this->assertTrue($field->isValidExpression('$.[2]'));
         $this->assertTrue($field->isValidExpression('$.cars.american[*]'));
+        $this->assertTrue($field->isValidExpression('[0:1:1]'));
+        $this->assertFalse($field->isValidExpression('[0:1:]'));
+        $this->assertFalse($field->isValidExpression('[0:1:1'));
+        $this->assertFalse($field->isValidExpression(''));
+        $this->assertFalse($field->isValidExpression('$.1.cars.american[*]'));
         $this->assertFalse($field->isValidExpression('$'));
         $this->assertFalse($field->isValidExpression('$[2]'));
     }