Update SessionListener.php

Author: barryvdh

src/Extension/Session/SessionListener.php

@@ -1,5 +1,9 @@
 <?php namespace Barryvdh\Form\Extension\Session;
 
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
 use Illuminate\Session\SessionManager;
@@ -9,6 +13,8 @@
 
 class SessionListener implements EventSubscriberInterface
 {
+    const UNDEFINED = '__BARRYVDH_FORMS_UNDEFINED';
+
     public static function getSubscribedEvents()
     {
         return array(
@@ -20,13 +26,17 @@ public function preSet(FormEvent $event)
     {
         $form = $event->getForm();
         $rootName = $form->getRoot()->getName();
+        $parent = $form->getParent();
 
-        if (! $form->isRoot() && $parent = $form->getParent()) {
+        if ($parent && !($parent->getConfig()->getType()->getInnerType() instanceof ChoiceType)) {
             $name = $this->getDottedName($form);
             $fullName = $this->getFullName($rootName, $name);
 
+            $value = old($fullName, static::UNDEFINED);
+
             // Add input from the previous submit
-            if ($form->getName() !== '_token' && $value = old($fullName)) {
+            if ($form->getName() !== '_token' && $value !== static::UNDEFINED) {
+
                 // Transform back to good data
                 $value = $this->transformValue($event, $value);
 
@@ -73,10 +83,26 @@ protected function getFullName($rootName, $dottedName)
     protected function transformValue(FormEvent $event, $value)
     {
         // Get all view transformers for this event
-        $transformers = $event->getForm()->getConfig()->getViewTransformers();
+        $config = $event->getForm()->getConfig();
+
+        // For Models, skip the transformation, that is done on children
+        $dataClass = $config->getDataClass();
+        if ($dataClass && is_array($value) && is_a($config->getDataClass(), Model::class, true)) {
+            return new $dataClass;
+        }
+
+        // If array is given, check if it needs to be a Collection
+        if (is_array($value) && $event->getData() instanceof Collection) {
+            $value = $event->getData()->make($value);
+        }
 
         // Reverse them all..
-        foreach ($transformers as $transformer) {
+        foreach ($config->getViewTransformers() as $transformer) {
+            $value = $transformer->reverseTransform($value);
+        }
+
+        // Map the models to correct values
+        foreach($config->getModelTransformers() as $transformer) {
             $value = $transformer->reverseTransform($value);
         }