added support for static addCondition(TRUE | FALSE)

Author: dg

src/Forms/Rules.php

@@ -109,6 +109,9 @@ public function addCondition($validator, $arg = NULL)
 	{
 		if ($validator === Form::VALID || $validator === ~Form::VALID) {
 			throw new Nette\InvalidArgumentException('You cannot use Form::VALID in the addCondition method.');
+		} elseif (is_bool($validator)) {
+			$arg = $validator;
+			$validator = ':static';
 		}
 		return $this->addConditionOn($this->control, $validator, $arg);
 	}

src/Forms/Validator.php

@@ -111,6 +111,15 @@ public static function validateNotEqual(IControl $control, $arg): bool
 	}
 
 
+	/**
+	 * Returns argument.
+	 */
+	public static function validateStatic(IControl $control, bool $arg): bool
+	{
+		return $arg;
+	}
+
+
 	/**
 	 * Is control filled?
 	 */

src/assets/netteForms.js

@@ -531,6 +531,10 @@
 				}
 			}
 			return true;
+		},
+
+		'static': function (elem, arg, val) {
+			return arg;
 		}
 	};
 

tests/Forms/Rules.static.phpt

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Nette\Forms\Rules;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test(function () {
+	$form = new Form;
+	$input = $form->addText('text');
+	$input->addCondition(FALSE)
+		->setRequired();
+
+	$rules = $input->getRules();
+	$items = iterator_to_array($rules);
+	Assert::count(1, $items);
+	Assert::same(':static', $items[0]->validator);
+	Assert::false($items[0]->arg);
+	Assert::type(Rules::class, $items[0]->branch);
+
+	Assert::true($rules->validate());
+});
+
+
+test(function () {
+	$form = new Form;
+	$input = $form->addText('text');
+	$input->addCondition(TRUE)
+		->setRequired();
+
+	$rules = $input->getRules();
+	$items = iterator_to_array($rules);
+	Assert::count(1, $items);
+	Assert::same(':static', $items[0]->validator);
+	Assert::true($items[0]->arg);
+	Assert::type(Rules::class, $items[0]->branch);
+
+	Assert::false($rules->validate());
+	Assert::same(['This field is required.'], $input->getErrors());
+});

tests/netteForms/spec/Nette.validateRuleSpec.js

@@ -16,6 +16,8 @@ describe('Nette.getValue & validateRule', function() {
 		expect(Nette.validateRule(el, 'filled')).toBe(false);
 		expect(Nette.validateRule(el, 'blank')).toBe(true);
 		expect(Nette.validateRule(el, 'equal', '')).toBe(true);
+		expect(Nette.validateRule(el, 'static', true)).toBe(true);
+		expect(Nette.validateRule(el, 'static', false)).toBe(false);
 
 		el.value = ' hello ';
 		expect(Nette.getValue(el)).toBe('hello');

tests/netteForms/spec/Nette.validatorsSpec.js

@@ -68,4 +68,9 @@ describe('Nette.validators', function() {
 		expect(Nette.validators.url(null, null, 'http://_e_.example.com', v)).toBe(true);
 	});
 
+
+	it('static', function() {
+		expect(Nette.validators.static(null, true)).toBe(true);
+		expect(Nette.validators.static(null, false)).toBe(false);
+	});
 });