Merge pull request #62 from matthiasnoback/add_test

Add test

Author: matthiasnoback

features/non-interactive.feature

@@ -84,6 +84,21 @@ Feature: It is possible to interactively fill in a form from the CLI
       )
       """
 
+  Scenario: A form field is optional and no option has been provided for it
+
+    The default form data for this command (EditUserCommand) has name Mario, lastName Rossi. When running the command,
+    only --lastName is provided. Instead of setting name to null, the existing name should not be modified.
+
+    When I run a command non-interactively with parameters
+      | Parameter  | Value          |
+      | command    | form:edit_user |
+      | --lastName | Verdi          |
+    Then the command has finished successfully
+    And the output should contain
+      """
+      name: Mario, lastName: Verdi
+      """
+
   Scenario: Nested form type in non-interactive mode
     When I run a command non-interactively with parameters
       | Parameter               | Value                    |

src/Console/Helper/FormHelper.php

@@ -63,7 +63,7 @@ public function interactUsingNamedForm(
 
             $submittedData = $this->formInteractor->interactWith($form, $this->getHelperSet(), $input, $output);
 
-            $form->submit($submittedData);
+            $form->submit($submittedData, false);
 
             // save the current data
             $data = $form->getData();

src/Form/EventListener/UseInputOptionsAsEventDataEventSubscriber.php

@@ -39,9 +39,15 @@ private function convertInputToSubmittedData(InputInterface $input, FormInterfac
                     $submittedData = $this->convertInputToSubmittedData($input, $field, $name ?? $form->getName());
                 } else {
                     $subName = $name === null ? $childName : $name . '[' . $childName . ']';
-                    $submittedData[$childName] = $this->convertInputToSubmittedData($input, $field, $subName);
+                    $subValue = $this->convertInputToSubmittedData($input, $field, $subName);
+                    if ($subValue !== null) {
+                        $submittedData[$childName] = $subValue;
+                    }
                 }
             }
+            if (empty($submittedData)) {
+                $submittedData = null;
+            }
         } else {
             $name = $name ?? $form->getName();
             if ($input->hasOption($name)) {

test/Command/EditUserCommand.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Command;
+
+use Matthias\SymfonyConsoleForm\Console\Command\FormBasedCommandWithDefault;
+use Matthias\SymfonyConsoleForm\Tests\Form\Data\User;
+
+final class EditUserCommand extends PrintFormDataCommand implements FormBasedCommandWithDefault
+{
+    public function getFormDefault()
+    {
+        $user = new User();
+        $user->name = 'Mario';
+        $user->lastName = 'Rossi';
+
+        return $user;
+    }
+}

test/Command/PrintFormDataCommand.php

@@ -12,15 +12,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $formData = $this->formData();
 
-        $printData = array_map(function ($data) {
-            if ($data instanceof \DateTime) {
-                return $data->format(\DateTime::ISO8601);
-            }
+        if (is_object($formData) && method_exists($formData, '__toString')) {
+            $printData = $formData->__toString();
+        } else {
+            $printData = print_r(
+                array_map(function ($data) {
+                    if ($data instanceof \DateTime) {
+                        return $data->format(\DateTime::ISO8601);
+                    }
 
-            return $data;
-        }, (array)$formData);
+                    return $data;
+                }, (array)$formData),
+                true
+            );
+        }
 
-        $output->write(print_r($printData, true));
+        $output->write($printData);
 
         return 0;
     }

test/Form/Data/User.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Form\Data;
+
+final class User
+{
+    public string $name;
+    public string $lastName;
+
+    public function __toString(): string
+    {
+        return 'name: ' . $this->name . ', lastName: ' . $this->lastName;
+    }
+}

test/Form/EditUserType.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Form;
+
+use Matthias\SymfonyConsoleForm\Tests\Form\Data\User;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EditUserType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TextType::class)
+            ->add('lastName', TextType::class);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'data_class' => User::class,
+            ]
+        );
+    }
+}

test/config.yml

@@ -170,6 +170,14 @@ services:
         tags:
             - { name: console.command }
 
+    edit_user_command:
+        class: Matthias\SymfonyConsoleForm\Tests\Command\EditUserCommand
+        arguments:
+            - Matthias\SymfonyConsoleForm\Tests\Form\EditUserType
+            - edit_user
+        tags:
+            - { name: console.command }
+
 framework:
     form:
         csrf_protection: true