Forms: negative rules like ~$form::ABCD are deprecated. (Negatives for FILLED & EQUAL are BLANK & NOT_EQUAL)

Negative rules are used occasionally, but makes a lot of complications, especially with default error messages. For cases where is negative validator needed, it is better to create new validator

Author: dg

src/Forms/Rules.php

@@ -122,10 +122,10 @@ public function addConditionOn(IControl $control, $validator, $arg = NULL)
 		$rule = new Rule;
 		$rule->control = $control;
 		$rule->validator = $validator;
-		$this->adjustOperation($rule);
 		$rule->arg = $arg;
 		$rule->branch = new static($this->control);
 		$rule->branch->parent = $this;
+		$this->adjustOperation($rule);
 
 		$this->rules[] = $rule;
 		return $rule->branch;
@@ -277,6 +277,10 @@ private function adjustOperation($rule)
 		if (is_string($rule->validator) && ord($rule->validator[0]) > 127) {
 			$rule->isNegative = TRUE;
 			$rule->validator = ~$rule->validator;
+			if (!$rule->branch) {
+				$name = strncmp($rule->validator, ':', 1) ? $rule->validator : 'Form:' . strtoupper($rule->validator);
+				trigger_error("Negative validation rules such as ~$name are deprecated.", E_USER_DEPRECATED);
+			}
 		}
 
 		if (!is_callable($this->getCallback($rule))) {

tests/Forms/Controls.TextBase.loadData.phpt

@@ -133,8 +133,8 @@ test(function () { // non float
 	$_POST = ['number' => ' 10,5 '];
 
 	$form = new Form;
-	$input = $form->addText('number')
-		->addRule(~$form::FLOAT);
+	$input = @$form->addText('number')
+		->addRule(~$form::FLOAT); // @ - negative rules are deprecated
 
 	$input->validate();
 	Assert::same(10.5, $input->getValue()); // side effect

tests/Forms/Forms.userValidator.phpt

@@ -26,9 +26,9 @@ function myValidator1($item, $arg)
 foreach ($datasets as $case) {
 
 	$form = new Form;
-	$control = $form->addText('value', 'Value:')
+	$control = @$form->addText('value', 'Value:')
 		->addRule('myValidator1', 'Value %d is not allowed!', 11)
-		->addRule(~'myValidator1', 'Value %d is required!', 22);
+		->addRule(~'myValidator1', 'Value %d is required!', 22); // @ - negative rules are deprecated
 
 	$control->setValue($case[0])->validate();
 	Assert::same($case[1], $control->getErrors());

tests/Forms/Rules.required.phpt

@@ -55,7 +55,7 @@ test(function () { // 'required' is always the first rule
 	Assert::same(Form::REQUIRED, $items[0]->validator);
 	Assert::same(Form::EMAIL, $items[1]->validator);
 
-	$rules->addRule(~$form::REQUIRED);
+	@$rules->addRule(~$form::REQUIRED); // @ - negative rules are deprecated
 	$items = iterator_to_array($rules);
 	Assert::count(2, $items);
 	Assert::same(Form::REQUIRED, $items[0]->validator);
@@ -90,6 +90,6 @@ test(function () { // addRule(~Form::REQUIRED)
 	$input = $form->addText('text');
 
 	Assert::false($input->isRequired());
-	Assert::same($input, $input->addRule(~Form::REQUIRED));
+	Assert::same($input, @$input->addRule(~Form::REQUIRED)); // @ - negative rules are deprecated
 	Assert::false($input->isRequired());
 });

tests/Forms/Rules.valid.phpt

@@ -53,7 +53,7 @@ test(function () {
 test(function () {
 	Assert::exception(function () {
 		$form = new Form;
-		$form->addText('foo')
-			->addRule(~Form::VALID);
+		@$form->addText('foo')
+			->addRule(~Form::VALID); // @ - negative rules are deprecated
 	}, Nette\InvalidArgumentException::class, 'You cannot use Form::VALID in the addRule method.');
 });