Rules: allow Form::VALID only in the addConditionOn [Closes #95][Closes #101]

Author: matej21

src/Forms/Rules.php

@@ -75,6 +75,9 @@ public function isRequired()
 	 */
 	public function addRule($validator, $message = NULL, $arg = NULL)
 	{
+		if ($validator === Form::VALID || $validator === ~Form::VALID) {
+			throw new Nette\InvalidArgumentException('You cannot use Form::VALID in the addRule method.');
+		}
 		$rule = new Rule;
 		$rule->control = $this->control;
 		$rule->validator = $validator;
@@ -98,6 +101,9 @@ public function addRule($validator, $message = NULL, $arg = NULL)
 	 */
 	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.');
+		}
 		return $this->addConditionOn($this->control, $validator, $arg);
 	}
 

tests/Forms/Rules.valid.phpt

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Test: Nette\Forms\Rules.
+ */
+
+use Nette\Forms\Form;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test(function () {
+	$form = new Form;
+	$form->addText('foo')
+		->setRequired('fill foo');
+	$form->addText('bar')
+		->addConditionOn($form['foo'], Form::VALID)
+		->setRequired('fill bar');
+
+	$form->validate();
+	Assert::same(['fill foo'], $form->getErrors());
+
+	$form['foo']->setValue('abc');
+	$form->validate();
+	Assert::same(['fill bar'], $form->getErrors());
+
+	$form['bar']->setValue('abc');
+	$form->validate();
+	Assert::same([], $form->getErrors());
+});
+
+
+test(function () {
+	Assert::exception(function () {
+		$form = new Form;
+		$form->addText('foo')
+			->addRule(Form::VALID);
+	}, Nette\InvalidArgumentException::class, 'You cannot use Form::VALID in the addRule method.');
+});
+
+
+test(function () {
+	Assert::exception(function () {
+		$form = new Form;
+		$form->addText('foo')
+			->addCondition(Form::VALID);
+	}, Nette\InvalidArgumentException::class, 'You cannot use Form::VALID in the addCondition method.');
+});
+
+
+test(function () {
+	Assert::exception(function () {
+		$form = new Form;
+		$form->addText('foo')
+			->addRule(~Form::VALID);
+	}, Nette\InvalidArgumentException::class, 'You cannot use Form::VALID in the addRule method.');
+});