add Form::PATTERN_ICASE as a case-insensitive variant of Form::PATTERN; fixes #185 (#187)

Author: renekliment

src/Forms/Form.php

@@ -46,6 +46,7 @@ class Form extends Container implements Nette\Utils\IHtmlString
 		EMAIL = ':email',
 		URL = ':url',
 		PATTERN = ':pattern',
+		PATTERN_ICASE = ':patternCaseInsensitive',
 		INTEGER = ':integer',
 		NUMERIC = ':numeric',
 		FLOAT = ':float',

src/Forms/Validator.php

@@ -246,12 +246,19 @@ public static function validateUrl(IControl $control): bool
 
 
 	/**
-	 * Matches control's value regular expression?
+	 * Does the control's value match the regular expression?
+	 * Case-sensitive to comply with the HTML5 <input /> pattern attribute behaviour
 	 */
-	public static function validatePattern(IControl $control, string $pattern): bool
+	public static function validatePattern(IControl $control, string $pattern, bool $caseInsensitive = false): bool
 	{
 		$value = $control->getValue() instanceof Nette\Http\FileUpload ? $control->getValue()->getName() : $control->getValue();
-		return (bool) Strings::match($value, "\x01^(?:$pattern)\\z\x01u");
+		return (bool) Strings::match($value, "\x01^(?:$pattern)\\z\x01u" . ($caseInsensitive ? 'i' : ''));
+	}
+
+
+	public static function validatePatternCaseInsensitive(IControl $control, string $pattern): bool
+	{
+		return self::validatePattern($control, $pattern, true);
 	}
 
 

src/assets/netteForms.js

@@ -448,16 +448,16 @@
 			} catch (e) {} // eslint-disable-line no-empty
 		},
 
-		pattern: function(elem, arg, val) {
+		pattern: function(elem, arg, val, value, caseInsensitive) {
 			if (typeof arg !== 'string') {
 				return null;
 			}
 
 			try {
 				try {
-					var regExp = new RegExp('^(?:' + arg + ')$', 'u');
+					var regExp = new RegExp('^(?:' + arg + ')$', caseInsensitive ? 'ui' : 'u');
 				} catch (e) {
-					regExp = new RegExp('^(?:' + arg + ')$');
+					regExp = new RegExp('^(?:' + arg + ')$', caseInsensitive ? 'i' : '');
 				}
 
 				if (window.FileList && val instanceof FileList) {
@@ -474,6 +474,10 @@
 			} catch (e) {} // eslint-disable-line no-empty
 		},
 
+		patternCaseInsensitive: function(elem, arg, val) {
+			return Nette.validators.pattern(elem, arg, val, null, true);
+		},
+
 		numeric: function(elem, arg, val) {
 			if (elem.type === 'number' && elem.validity.badInput) {
 				return false;

tests/Forms/Controls.TestBase.validators.phpt

@@ -95,6 +95,14 @@ test(function () {
 	Assert::false(Validator::validatePattern($control, '[0-9]+X'));
 });
 
+test(function () {
+	$control = new TextInput;
+	$control->value = '123x';
+	Assert::false(Validator::validatePatternCaseInsensitive($control, '[0-9]'));
+	Assert::true(Validator::validatePatternCaseInsensitive($control, '[0-9]+x'));
+	Assert::true(Validator::validatePatternCaseInsensitive($control, '[0-9]+X'));
+});
+
 
 test(function () {
 	class MockUploadControl extends UploadControl

tests/netteForms/spec/Nette.validateRuleSpec.js

@@ -45,6 +45,14 @@ describe('Nette.getValue & validateRule', function() {
 		expect(Nette.validateRule(el, 'pattern', '\\d')).toBe(false);
 		expect(Nette.validateRule(el, 'pattern', '\\w')).toBe(false);
 		expect(Nette.validateRule(el, 'pattern', '\\w+')).toBe(true);
+		expect(Nette.validateRule(el, 'pattern', 'hello')).toBe(true);
+		expect(Nette.validateRule(el, 'pattern', 'HELLO')).toBe(false);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', '\\d+')).toBe(false);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', '\\d')).toBe(false);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', '\\w')).toBe(false);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', '\\w+')).toBe(true);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', 'hello')).toBe(true);
+		expect(Nette.validateRule(el, 'patternCaseInsensitive', 'HELLO')).toBe(true);
 		expect(Nette.validateRule(el, 'integer')).toBe(false);
 		expect(Nette.validateRule(el, 'float')).toBe(false);