Merge branch 'master' into dont-cast-form-data-to-array-if-its-not-iterable

Author: matthiasnoback

features/interactive.feature

@@ -329,3 +329,19 @@ Feature: It is possible to interactively fill in a form from the CLI
           )
       )
       """
+
+  Scenario: Command with default form data
+    When I run the command "form:default_value_command" and I provide as input
+      | Input |
+      | foo   |
+    And the output should contain
+      """
+        Street [already save address]:
+      """
+    And the output should contain
+      """
+        Array
+        (
+            [street] => foo
+        )
+      """

src/Console/Command/FormBasedCommandWithDefault.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace Matthias\SymfonyConsoleForm\Console\Command;
+
+interface FormBasedCommandWithDefault
+{
+    /**
+     * Returning default data of a form
+     *
+     * @return mixed
+     */
+    public function getFormDefault();
+}

src/Console/EventListener/HandleFormBasedCommandEventListener.php

@@ -3,6 +3,7 @@
 namespace Matthias\SymfonyConsoleForm\Console\EventListener;
 
 use Matthias\SymfonyConsoleForm\Console\Command\FormBasedCommand;
+use Matthias\SymfonyConsoleForm\Console\Command\FormBasedCommandWithDefault;
 use Matthias\SymfonyConsoleForm\Console\Helper\FormHelper;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
@@ -27,8 +28,18 @@ public function onConsoleCommand(ConsoleCommandEvent $event): void
 
         $input = $event->getInput();
         $output = $event->getOutput();
+        $defaultData = null;
+        if ($command instanceof FormBasedCommandWithDefault) {
+            $defaultData = $command->getFormDefault();
+        }
 
-        $formData = $this->formQuestionHelper->interactUsingForm($command->formType(), $input, $output);
+        $formData = $this->formQuestionHelper->interactUsingForm(
+            $command->formType(),
+            $input,
+            $output,
+            [],
+            $defaultData
+        );
 
         $command->setFormData($formData);
     }

test/Command/DefaultFormDataCommand.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Command;
+
+use Matthias\SymfonyConsoleForm\Console\Command\FormBasedCommandWithDefault;
+use Matthias\SymfonyConsoleForm\Tests\Form\Data\Address;
+
+class DefaultFormDataCommand extends PrintFormDataCommand implements FormBasedCommandWithDefault
+{
+    public function getFormDefault()
+    {
+        return new Address('already save address');
+    }
+}

test/config.yml

@@ -31,6 +31,12 @@ services:
         arguments:
             - Matthias\SymfonyConsoleForm\Tests\Form\AddressesType
             - array_collection_form_addresses
+
+    default_value_command:
+        class: Matthias\SymfonyConsoleForm\Tests\Command\DefaultFormDataCommand
+        arguments:
+            - Matthias\SymfonyConsoleForm\Tests\Form\AddressType
+            - default_value_command
         tags:
             - { name: console.command }