Form::getValues() returns only controls in scope (BC break)

Other controls are not validated

Author: dg

src/Forms/Container.php

@@ -103,10 +103,10 @@ public function setValues($data, bool $erase = false)
 	/**
 	 * Returns the values submitted by the form.
 	 * @param  string|object|null  $returnType  'array' for array
-
+	 * @param  Control[]|null  $controls
 	 * @return object|array
 	 */
-	public function getValues($returnType = null)
+	public function getValues($returnType = null, array $controls = null)
 	{
 		if ($returnType === self::ARRAY || $returnType === true || $this->mappedType === self::ARRAY) {
 			$returnType = self::ARRAY;
@@ -123,14 +123,18 @@ public function getValues($returnType = null)
 		$rc = new \ReflectionClass($obj);
 		foreach ($this->getComponents() as $name => $control) {
 			$name = (string) $name;
-			if ($control instanceof Control && !$control->isOmitted()) {
+			if (
+				$control instanceof Control
+				&& !$control->isOmitted()
+				&& ($controls === null || in_array($control, $controls, true))
+			) {
 				$obj->$name = $control->getValue();
 
 			} elseif ($control instanceof self) {
 				$type = $returnType === self::ARRAY && !$control->mappedType
 					? self::ARRAY
 					: ($rc->hasProperty($name) ? Nette\Utils\Reflection::getPropertyType($rc->getProperty($name)) : null);
-				$obj->$name = $control->getValues($type);
+				$obj->$name = $control->getValues($type, $controls);
 			}
 		}
 
@@ -172,7 +176,7 @@ public function isValid(): bool
 	 */
 	public function validate(array $controls = null): void
 	{
-		foreach ($controls === null ? $this->getComponents() : $controls as $control) {
+		foreach ($controls ?? $this->getComponents() as $control) {
 			if ($control instanceof Control || $control instanceof self) {
 				$control->validate();
 			}

src/Forms/Form.php

@@ -358,6 +358,21 @@ public function setSubmittedBy(?SubmitterControl $by)
 	}
 
 
+	/**
+	 * Returns the values submitted by the form.
+	 * @param  string|null  $returnType  'array' for array
+	 * @param  Control[]|null  $controls
+	 * @return object|array
+	 */
+	public function getValues($returnType = null, array $controls = null)
+	{
+		if ($controls === null && $this->submittedBy instanceof SubmitterControl) {
+			$controls = $this->submittedBy->getValidationScope();
+		}
+		return parent::getValues($returnType, $controls);
+	}
+
+
 	/**
 	 * Returns submitted HTTP data.
 	 * @return mixed

tests/Forms/Container.values.array.phpt

@@ -256,3 +256,22 @@ test('onSuccess test', function () {
 	$form->fireEvents();
 	Assert::true($ok);
 });
+
+
+test('submitted form + setValidationScope() + getValues(true)', function () {
+	$_SERVER['REQUEST_METHOD'] = 'POST';
+	$_POST['send'] = '';
+
+	$form = createForm();
+	$form->addSubmit('send')->setValidationScope([$form['title'], $form['first']['second']['city']]);
+
+	Assert::truthy($form->isSubmitted());
+	Assert::equal([
+		'title' => 'sent title',
+		'first' => [
+			'second' => [
+				'city' => 'sent city',
+			],
+		],
+	], $form->getValues(true));
+});

tests/Forms/Container.values.mapping.phpt

@@ -335,3 +335,22 @@ test('getValues() + object', function () {
 
 	Assert::same($obj, $orig);
 });
+
+
+test('submitted form + setValidationScope() + getValues(true)', function () {
+	$_SERVER['REQUEST_METHOD'] = 'POST';
+	$_POST['send'] = '';
+
+	$form = createForm();
+	$form->addSubmit('send')->setValidationScope([$form['title'], $form['first']['second']['city']]);
+
+	Assert::truthy($form->isSubmitted());
+	Assert::equal(hydrate(FormData::class, [
+		'title' => 'sent title',
+		'first' => ArrayHash::from([
+			'second' => ArrayHash::from([
+				'city' => 'sent city',
+			]),
+		]),
+	]), $form->getValues(FormData::class));
+});