made mapping to a KeyValueContainer object optional (and false by default)

Author: Burgov

Form/DataTransformer/HashToKeyValueArrayTransformer.php

@@ -8,6 +8,16 @@
 class HashToKeyValueArrayTransformer implements DataTransformerInterface
 {
 
+    private $useContainerObject;
+
+    /**
+     * @param bool $useContainerObject Whether to return a KeyValueContainer object or simply an array
+     */
+    public function __construct($useContainerObject)
+    {
+        $this->useContainerObject = $useContainerObject;
+    }
+
     /**
      * Doing the transformation here would be too late for the collection type to do it's resizing magic, so
      * instead it is done in the forms PRE_SET_DATA listener
@@ -17,9 +27,14 @@ public function transform($value)
         return $value;
     }
 
+    /**
+     * @param mixed $value
+     * @return KeyValueContainer|array
+     * @throws \Symfony\Component\Form\Exception\TransformationFailedException
+     */
     public function reverseTransform($value)
     {
-        $return = new KeyValueContainer();
+        $return = $this->useContainerObject ? new KeyValueContainer() : array();
 
         foreach ($value as $data) {
             if (array('key', 'value') != array_keys($data)) {

Form/Type/KeyValueType.php

@@ -14,7 +14,7 @@ class KeyValueType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addModelTransformer(new HashToKeyValueArrayTransformer());
+        $builder->addModelTransformer(new HashToKeyValueArrayTransformer($options['use_container_object']));
 
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $e) {
             $input = $e->getData();
@@ -44,6 +44,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'allow_delete' => true,
             'value_options' => array(),
             'allowed_keys' => null,
+            'use_container_object' => false,
             'options' => function(Options $options) {
                 return array(
                     'value_type' => $options['value_type'],