Merge pull request #55 from matthiasnoback/cristoforocervino-master

fix fatal error when using an object as default value in ChoiceType (continued)

Author: matthiasnoback

features/interactive.feature

@@ -50,8 +50,8 @@ Feature: It is possible to interactively fill in a form from the CLI
 
   Scenario: Provide an integer
     When I run the command "form:age" and I provide as input
-      | Input      |
-      | 10 |
+      | Input |
+      | 10    |
     Then the command has finished successfully
     And the output should be
       """
@@ -301,6 +301,30 @@ Feature: It is possible to interactively fill in a form from the CLI
       )
       """
 
+  Scenario: Choice with default value which cannot be converted to string
+    When I run the command "form:unstringable_choices" and I provide as input
+      | Input |
+      |       |
+    Then the command has finished successfully
+    And the output should contain
+      """
+      Select address:
+        [0] 10 Downing Street
+        [1] 1600 Pennsylvania Ave NW
+        [2] 55 Rue du Faubourg Saint-Honoré
+       >
+      """
+    And the output should contain
+      """
+      Array
+      (
+        [address] => Matthias\SymfonyConsoleForm\Tests\Form\Data\Address Object
+          (
+            [street] => 10 Downing Street
+          )
+      )
+      """
+
   Scenario: Command with default form data
     When I run the command "form:default_value_command" and I provide as input
       | Input |

src/Bridge/Transformer/ChoiceTransformer.php

@@ -4,6 +4,7 @@
 
 use Matthias\SymfonyConsoleForm\Console\Helper\Question\AlwaysReturnKeyOfChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\FormInterface;
 
 final class ChoiceTransformer extends AbstractTransformer
@@ -20,4 +21,24 @@ public function transform(FormInterface $form): Question
 
         return $question;
     }
+
+    protected function defaultValueFrom(FormInterface $form)
+    {
+        $defaultValue = parent::defaultValueFrom($form);
+
+        /*
+         * $defaultValue can be anything, since it's the form's (default) data. For the ChoiceType form type the default
+         * value may be derived from the choice_label option, which transforms the data to a string. We look for the
+         * choice matching the default data and return its calculated value.
+         */
+        $formView = $form->createView();
+        foreach ($formView->vars['choices'] as $choiceView) {
+            /** @var ChoiceView $choiceView */
+            if ($choiceView->data == $defaultValue) {
+                return $choiceView->value;
+            }
+        }
+
+        return $defaultValue;
+    }
 }

test/Form/UnstringableChoicesType.php

@@ -25,6 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choice_label' => function (Address $address) {
                     return $address->street;
                 },
+                'data' => new Address('10 Downing Street')
             ]);
     }
 }