Merge pull request #1220 from ytetsuro/fix/split-validation-rules

Improved division logic of validation rules.

Author: lonnieezell

system/Validation/Validation.php

@@ -707,43 +707,18 @@ protected function getErrorMessage(string $rule, string $field, string $label =
 	 */
 	protected function splitRules(string $rules): array
 	{
-		$_rules   = [];
-		$pipe_pos = strpos($rules, '|');
-		while ($pipe_pos !== false)
-		{
-			// the if is for the regex_match
-			// if the pattern contains | (pipe) the split was incorrect
-			// so we make sure that, if the pipe is in a pattern we find the separator and
-			// grab the string up to the separator + closing bracket
-			$open_bracket_pos = strpos($rules, '[');
-			if ($open_bracket_pos !== false && $open_bracket_pos < $pipe_pos)
-			{
-				$separator = $rules[$open_bracket_pos+1];
-
-				if (preg_match('/(?<!\\\\)(?:\\\\\\\\)*\\'.$separator.'\]/', $rules, $matches, PREG_OFFSET_CAPTURE))
-				{
-					$regex_end_pos = $matches[0][1];
-
-					$_rules[] = substr($rules, 0, $regex_end_pos+2);
-
-					$rules = substr($rules, $regex_end_pos+3);
-
-					$pipe_pos = strpos($rules, '|');
-					continue;
-				}
-			}
-
-			$_rules[] = substr($rules, 0, $pipe_pos);
-			$rules    = substr($rules, $pipe_pos+1);
-
-			$pipe_pos = strpos($rules, '|');
-		}
-
-		// if there is another rule remaining but no separator just add it to the list
-		if (! empty($rules))
-		{
-			$_rules[] = $rules;
-		}
+		$non_escape_bracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
+		$pipe_not_in_bracket = sprintf(
+			'/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
+			$non_escape_bracket,
+			$non_escape_bracket,
+			$non_escape_bracket
+		);
+
+		$_rules = preg_split(
+			$pipe_not_in_bracket,
+			$rules
+		);
 
 		return array_unique($_rules);
 	}

tests/system/Validation/ValidationTest.php

@@ -550,8 +550,8 @@ public function testSplitRegex()
 	{
 		$method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
 
-		$result = $method('required|regex_match[/^[0-9]{4}[\-\.\/][0-9]{2}[\-\.\/][0-9]{2}/]|max_length[10]');
+		$result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
 
-		$this->assertEquals('regex_match[/^[0-9]{4}[\-\.\/][0-9]{2}[\-\.\/][0-9]{2}/]', $result[1]);
+		$this->assertEquals('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
 	}
 }