Form::$onSuccess and Container::$onValidate must be array of Traversable

Author: dg

src/Forms/Container.php

@@ -134,10 +134,15 @@ public function validate(array $controls = NULL)
 		foreach ($controls === NULL ? $this->getComponents() : $controls as $control) {
 			$control->validate();
 		}
-		foreach ($this->onValidate ?: [] as $handler) {
-			$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
-			$values = isset($params[1]) ? $this->getValues($params[1]->isArray()) : NULL;
-			Nette\Utils\Callback::invoke($handler, $this, $values);
+		if ($this->onValidate !== NULL) {
+			if (!is_array($this->onValidate) && !$this->onValidate instanceof \Traversable) {
+				throw new Nette\UnexpectedValueException('Property Form::$onValidate must be array or Traversable, ' . gettype($this->onValidate) . ' given.');
+			}
+			foreach ($this->onValidate as $handler) {
+				$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
+				$values = isset($params[1]) ? $this->getValues($params[1]->isArray()) : NULL;
+				Nette\Utils\Callback::invoke($handler, $this, $values);
+			}
 		}
 		$this->validated = TRUE;
 	}

src/Forms/Form.php

@@ -400,7 +400,11 @@ public function fireEvents()
 
 		if (!$this->isValid()) {
 			$this->onError($this);
-		} elseif ($this->onSuccess) {
+
+		} elseif ($this->onSuccess !== NULL) {
+			if (!is_array($this->onSuccess) && !$this->onSuccess instanceof \Traversable) {
+				throw new Nette\UnexpectedValueException('Property Form::$onSuccess must be array or Traversable, ' . gettype($this->onSuccess) . ' given.');
+			}
 			foreach ($this->onSuccess as $handler) {
 				$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
 				$values = isset($params[1]) ? $this->getValues($params[1]->isArray()) : NULL;

tests/Forms/Container.validate().phpt

@@ -32,3 +32,10 @@ Assert::same([
 	'fail 1',
 	'fail 2',
 ], $form->getErrors());
+
+
+Assert::exception(function () {
+	$form = new Form;
+	$form->onValidate = TRUE;
+	$form->validate();
+}, Nette\UnexpectedValueException::class, 'Property Form::$onValidate must be array or Traversable, boolean given.');

tests/Forms/Forms.onSuccess.phpt

@@ -53,3 +53,10 @@ $form->onError[] = function () use (& $called) {
 };
 $form->fireEvents();
 Assert::same([1, 2, 'err'], $called);
+
+
+Assert::exception(function () {
+	$form = new Form;
+	$form->onSuccess = TRUE;
+	$form->fireEvents();
+}, Nette\UnexpectedValueException::class, 'Property Form::$onSuccess must be array or Traversable, boolean given.');