FIX: template parser erroring on strings partially matching true/fals…

…e/null
silverstripe · Oct 5, 2018 · 3dcfc64 · 3dcfc64
1 parent 01ba4f1
commit 3dcfc64
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/View/SSTemplateParser.peg b/src/View/SSTemplateParser.peg
@@ -408,11 +408,11 @@ class SSTemplateParser extends Parser implements TemplateParser
 
     # Null
 
-    Null: / null /i
+    Null: / (null)\b /i
 
     # Booleans
 
-    Boolean: / (true|false) /i
+    Boolean: / (true|false)\b  /i
 
     # Integers and floats
 

diff --git a/src/View/SSTemplateParser.php b/src/View/SSTemplateParser.php
@@ -1151,23 +1151,23 @@ function match_QuotedString ($stack = array()) {
     }
 
 
-    /* Null: / null /i */
+    /* Null: / (null)\b /i */
     protected $match_Null_typestack = array('Null');
     function match_Null ($stack = array()) {
     	$matchrule = "Null"; $result = $this->construct($matchrule, $matchrule, null);
-    	if (( $subres = $this->rx( '/ null /i' ) ) !== FALSE) {
+    	if (( $subres = $this->rx( '/ (null)\b /i' ) ) !== FALSE) {
     		$result["text"] .= $subres;
     		return $this->finalise($result);
     	}
     	else { return FALSE; }
     }
 
 
-    /* Boolean: / (true|false) /i */
+    /* Boolean: / (true|false)\b  /i */
     protected $match_Boolean_typestack = array('Boolean');
     function match_Boolean ($stack = array()) {
     	$matchrule = "Boolean"; $result = $this->construct($matchrule, $matchrule, null);
-    	if (( $subres = $this->rx( '/ (true|false) /i' ) ) !== FALSE) {
+    	if (( $subres = $this->rx( '/ (true|false)\b  /i' ) ) !== FALSE) {
     		$result["text"] .= $subres;
     		return $this->finalise($result);
     	}

diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php
@@ -697,9 +697,12 @@ public function typePreservationDataProvider()
             ['boolean:1', 'TRUE'],
             ['boolean:', 'false'],
             ['boolean:', 'FALSE'],
-            // Strings which loosely look like booleans
-            ['string:truthy', 'truthy'],
-            ['string:falsy', 'falsy'],
+            // Strings which may look like booleans/null to the parser
+            ['string:nullish', 'nullish'],
+            ['string:notnull', 'notnull'],
+            ['string:truethy', 'truethy'],
+            ['string:untrue', 'untrue'],
+            ['string:falsey', 'falsey'],
             // Integers
             ['integer:0', '0'],
             ['integer:1', '1'],