Form::onValidate - values are passed only when form is valid

Author: dg

src/Forms/Container.php

@@ -171,9 +171,11 @@ public function validate(array $controls = null): void
 			if (!is_iterable($this->onValidate)) {
 				throw new Nette\UnexpectedValueException('Property Form::$onValidate must be iterable, ' . gettype($this->onValidate) . ' given.');
 			}
+
+			$isValid = !$this->getErrors();
 			foreach ($this->onValidate as $handler) {
 				$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
-				$values = isset($params[1])
+				$values = isset($params[1]) && $isValid
 					? $this->getValues($params[1]->getType() instanceof \ReflectionNamedType ? $params[1]->getType()->getName() : null)
 					: null;
 				$handler($this, $values);

tests/Forms/Forms.validationScope.phpt

@@ -15,29 +15,32 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $datasets = [
-	['send1', ['container', 'form', 'name', 'age', 'age2']],
-	['send2', ['form']],
-	['send3', ['form', 'name']],
-	['send4', ['form', 'age']],
-	['send5', ['container', 'form', 'age', 'age2']],
+	['send1', ['container', 'form', 'name', 'age', 'age2'], null],
+	['send2', ['form'], ['optional' => '', 'details' => []]],
+	['send3', ['form', 'name'], null],
+	['send4', ['form', 'age'], null],
+	['send5', ['container', 'form', 'age', 'age2'], null],
 ];
 
 foreach ($datasets as $case) {
 	$form = new Form;
-	$form->onValidate[] = function (Form $form) {
+	$form->onValidate[] = function (Form $form, ?array $values) use (&$values1) {
 		$form->addError('form');
+		$values1 = $values;
 	};
 	$form->addText('name')->setRequired('name');
+	$form->addText('optional');
 
 	$details = $form->addContainer('details');
-	$details->onValidate[] = function (Container $container) {
+	$details->onValidate[] = function (Container $container, $values) use (&$values2) {
 		$container->getForm()->addError('container');
+		$values2 = $values;
 	};
 	$details->addText('age')->setRequired('age');
 	$details->addText('age2')->setRequired('age2');
 
 	$form->addSubmit('send1');
-	$form->addSubmit('send2')->setValidationScope([]);
+	$form->addSubmit('send2')->setValidationScope([$form['optional']]);
 	$form->addSubmit('send3')->setValidationScope([$form['name']]);
 	$form->addSubmit('send4')->setValidationScope([$form['details']['age']]);
 	$form->addSubmit('send5')->setValidationScope([$form['details']]);
@@ -47,4 +50,7 @@ foreach ($datasets as $case) {
 	Assert::truthy($form->isSubmitted());
 	$form->validate();
 	Assert::equal($case[1], $form->getErrors());
+
+	Assert::same($case[2], $values1);
+	Assert::null($values2);
 }