PatternConstraint to escape early, refs #1417

SemanticMediaWiki · Jul 7, 2016 · 789f974 · 789f974
1 parent 03f0336
commit 789f974
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/DataValues/ValueValidators/PatternConstraintValueValidator.php b/src/DataValues/ValueValidators/PatternConstraintValueValidator.php
@@ -83,6 +83,9 @@ public function validate( $dataValue ) {
 
 	private function doPregMatch( $pattern, $dataValue, $reference ) {
 
+		// Convert escaping as in /\d{4}
+		$pattern = str_replace( "/\\", "\\", $pattern );
+
 		// Add a mandatory backslash
 		if ( $pattern !== '' && $pattern{0} !== '/' ) {
 			$pattern = '/' . $pattern;
@@ -92,9 +95,6 @@ private function doPregMatch( $pattern, $dataValue, $reference ) {
 			$pattern = $pattern . '/';
 		}
 
-		// Convert escaping
-		$pattern = str_replace( "/\\", "\\", $pattern );
-
 		// @to suppress any errors caused by an invalid regex, the user should
 		// test the expression before making it available
 		if ( !@preg_match( $pattern, $dataValue->getDataItem()->getSortKey() ) ) {

diff --git a/tests/phpunit/Unit/DataValues/ValueValidators/PatternConstraintValueValidatorTest.php b/tests/phpunit/Unit/DataValues/ValueValidators/PatternConstraintValueValidatorTest.php
@@ -127,6 +127,20 @@ public function allowedPatternProvider() {
 			true
 		);
 
+		#4
+		$provider[] = array(
+			" \nFoo|\d{8}\n",
+			'00564222',
+			false
+		);
+
+		#5
+		$provider[] = array(
+			" \nFoo|/\d{8}\n",
+			'00564222',
+			false
+		);
+
 		return $provider;
 	}