Validator::validateEqual returns false if control value is empty array (BC break) [Closes #257]

Author: dg

src/Forms/Validator.php

@@ -107,15 +107,18 @@ public static function formatMessage(Rule $rule, bool $withValue = true)
 	public static function validateEqual(Control $control, $arg): bool
 	{
 		$value = $control->getValue();
-		foreach ((is_array($value) ? $value : [$value]) as $val) {
-			foreach ((is_array($arg) ? $arg : [$arg]) as $item) {
+		$values = is_array($value) ? $value : [$value];
+		$args = is_array($arg) ? $arg : [$arg];
+
+		foreach ($values as $val) {
+			foreach ($args as $item) {
 				if ((string) $val === (string) $item) {
 					continue 2;
 				}
 			}
 			return false;
 		}
-		return true;
+		return (bool) $values;
 	}
 
 

src/assets/netteForms.js

@@ -371,7 +371,7 @@
 				}
 				return false;
 			}
-			return true;
+			return val.length > 0;
 		},
 
 		notEqual: function(elem, arg, val) {

tests/Forms/Controls.BaseControl.phpt

@@ -43,6 +43,7 @@ test('validators', function () {
 	Assert::true(Validator::validateEqual($input, '123'));
 	Assert::true(Validator::validateEqual($input, [123, 3])); // "is in"
 	Assert::false(Validator::validateEqual($input, ['x']));
+	Assert::false(Validator::validateEqual($input, []));
 
 	Assert::true(Validator::validateFilled($input));
 	Assert::true(Validator::validateValid($input));

tests/Forms/Controls.CheckboxList.loadData.phpt

@@ -142,6 +142,21 @@ test('validateEqual', function () use ($series) {
 	Assert::false(Validator::validateEqual($input, 'unknown'));
 	Assert::false(Validator::validateEqual($input, ['unknown']));
 	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
+});
+
+
+test('empty input & validateEqual', function () use ($series) {
+	$_POST = [];
+
+	$form = new Form;
+	$input = $form->addCheckboxList('multi', null, $series);
+
+	Assert::false(Validator::validateEqual($input, ['red-dwarf', 0]));
+	Assert::false(Validator::validateEqual($input, 'unknown'));
+	Assert::false(Validator::validateEqual($input, ['unknown']));
+	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
 });
 
 

tests/Forms/Controls.MultiChoiceControl.loadData.phpt

@@ -154,6 +154,21 @@ test('validateEqual', function () use ($series) {
 	Assert::false(Validator::validateEqual($input, 'unknown'));
 	Assert::false(Validator::validateEqual($input, ['unknown']));
 	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
+});
+
+
+test('empty input & validateEqual', function () use ($series) {
+	$_POST = [];
+
+	$form = new Form;
+	$input = $form['multi'] = new MultiChoiceControl(null, $series);
+
+	Assert::false(Validator::validateEqual($input, ['red-dwarf', 0]));
+	Assert::false(Validator::validateEqual($input, 'unknown'));
+	Assert::false(Validator::validateEqual($input, ['unknown']));
+	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
 });
 
 

tests/Forms/Controls.MultiSelectBox.loadData.phpt

@@ -150,6 +150,21 @@ test('validateEqual', function () use ($series) {
 	Assert::false(Validator::validateEqual($input, 'unknown'));
 	Assert::false(Validator::validateEqual($input, ['unknown']));
 	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
+});
+
+
+test('empty input & validateEqual', function () use ($series) {
+	$_POST = [];
+
+	$form = new Form;
+	$input = $form->addMultiSelect('multi', null, $series);
+
+	Assert::false(Validator::validateEqual($input, ['red-dwarf', 0]));
+	Assert::false(Validator::validateEqual($input, 'unknown'));
+	Assert::false(Validator::validateEqual($input, ['unknown']));
+	Assert::false(Validator::validateEqual($input, [0]));
+	Assert::false(Validator::validateEqual($input, []));
 });