Form::getValues() triggers warning when form is not valid

Author: dg

src/Forms/Container.php

@@ -108,6 +108,11 @@ public function setValues($data, bool $erase = false)
 	 */
 	public function getValues($returnType = null, array $controls = null)
 	{
+		$form = $this->getForm(false);
+		if ($form && $form->isSubmitted() && !$form->isValid()) {
+			trigger_error(__METHOD__ . '() invoked but the form is not valid.', E_USER_WARNING);
+		}
+
 		if ($returnType === self::ARRAY || $returnType === true || $this->mappedType === self::ARRAY) {
 			$returnType = self::ARRAY;
 			$obj = new \stdClass;
@@ -181,6 +186,8 @@ public function validate(array $controls = null): void
 				$control->validate();
 			}
 		}
+		$this->validated = true;
+
 		if ($this->onValidate !== null) {
 			if (!is_iterable($this->onValidate)) {
 				throw new Nette\UnexpectedValueException('Property Form::$onValidate must be iterable, ' . gettype($this->onValidate) . ' given.');
@@ -195,7 +202,6 @@ public function validate(array $controls = null): void
 				$handler($this, $values);
 			}
 		}
-		$this->validated = true;
 	}
 
 

tests/Forms/Container.values.ArrayHash.phpt

@@ -74,7 +74,7 @@ test('submitted form + getValues()', function () {
 		'title' => 'sent title',
 		'first' => ArrayHash::from([
 			'name' => '',
-			'age' => '999',
+			'age' => 999,
 			'second' => ArrayHash::from([
 				'city' => 'sent city',
 			]),
@@ -122,7 +122,7 @@ test('setValues() + iterable', function () {
 		'title' => 'new1',
 		'first' => ArrayHash::from([
 			'name' => 'new2',
-			'age' => '999',
+			'age' => 999,
 			'second' => ArrayHash::from([
 				'city' => 'sent city',
 			]),

tests/Forms/Container.values.array.phpt

@@ -74,7 +74,7 @@ test('submitted form + getValues(true)', function () {
 		'title' => 'sent title',
 		'first' => [
 			'name' => '',
-			'age' => '999',
+			'age' => 999,
 			'second' => [
 				'city' => 'sent city',
 			],
@@ -122,7 +122,7 @@ test('setValues() + array', function () {
 		'title' => 'new1',
 		'first' => [
 			'name' => 'new2',
-			'age' => '999',
+			'age' => 999,
 			'second' => [
 				'city' => 'sent city',
 			],
@@ -168,7 +168,7 @@ test('getValues(...arguments...)', function () {
 		'title' => 'new1',
 		'first' => [
 			'name' => 'new2',
-			'age' => '999',
+			'age' => 999,
 			'second' => [
 				'city' => 'sent city',
 			],
@@ -196,7 +196,7 @@ test('setMappedType(array)', function () {
 		'title' => 'new1',
 		'first' => [
 			'name' => 'new2',
-			'age' => '999',
+			'age' => 999,
 			'second' => [
 				'city' => 'sent city',
 			],

tests/Forms/Container.values.mapping.phpt

@@ -116,7 +116,7 @@ test('submitted form + getValues()', function () {
 		'title' => 'sent title',
 		'first' => ArrayHash::from([
 			'name' => '',
-			'age' => '999',
+			'age' => 999,
 			'second' => ArrayHash::from([
 				'city' => 'sent city',
 			]),
@@ -326,7 +326,7 @@ test('getValues() + object', function () {
 		'title' => 'sent title',
 		'first' => ArrayHash::from([
 			'name' => '',
-			'age' => '999',
+			'age' => 999,
 			'second' => ArrayHash::from([
 				'city' => 'sent city',
 			]),

tests/Forms/Forms.validationScope.phpt

@@ -13,7 +13,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-
+//Tracy\Debugger::enable();
 $datasets = [
 	['send1', ['container', 'form', 'name', 'age', 'age2'], null],
 	['send2', ['form'], ['optional' => '', 'details' => []]],