Container::getValues('array') propagates arrays to inner containers only when mappedType is not set

Author: dg

src/Forms/Container.php

@@ -38,8 +38,8 @@ class Container extends Nette\ComponentModel\Container implements \ArrayAccess
 	/** @var bool */
 	private $validated;
 
-	/** @var string */
-	private $mappedType = ArrayHash::class;
+	/** @var ?string */
+	private $mappedType;
 
 
 	/********************* data exchange ****************d*g**/
@@ -109,7 +109,7 @@ public function getValues($returnType = null)
 	{
 		$returnType = $returnType
 			? ($returnType === true ? self::ARRAY : $returnType) // back compatibility
-			: $this->mappedType;
+			: ($this->mappedType ?? ArrayHash::class);
 
 		$isArray = $returnType === self::ARRAY;
 		$obj = $isArray ? new \stdClass : new $returnType;
@@ -118,7 +118,7 @@ public function getValues($returnType = null)
 			if ($control instanceof IControl && !$control->isOmitted()) {
 				$obj->$name = $control->getValue();
 			} elseif ($control instanceof self) {
-				$obj->$name = $control->getValues($isArray ? self::ARRAY : null);
+				$obj->$name = $control->getValues($isArray && !$control->mappedType ? self::ARRAY : null);
 			}
 		}
 		return $isArray ? (array) $obj : $obj;

tests/Forms/Container.values.mapping.phpt

@@ -238,13 +238,13 @@ test(function () { // getValues(...arguments...)
 
 	Assert::equal([
 		'title' => 'new1',
-		'first' => [
+		'first' => hydrate(FormFirstLevel::class, [
 			'name' => 'new2',
 			'age' => null,
-			'second' => [
+			'second' => hydrate(FormSecondLevel::class, [
 				'city' => '',
-			],
-		],
+			]),
+		]),
 	], $form->getValues(true));
 });