add failing test for non-compound forms

Author: cristoforocervino

features/interactive.feature

@@ -364,3 +364,24 @@ Feature: It is possible to interactively fill in a form from the CLI
             [street] => foo
         )
       """
+
+  Scenario: Non-compound form type in interactive mode
+    When I run the command "form:non_compound_color" and I provide as input "blue" with parameters
+      | Parameter | Value  |
+      | --color   | yellow |
+    Then the command has finished successfully
+    And the output should contain
+      """
+      Select color [yellow]:
+        [red   ] Red
+        [blue  ] Blue
+        [yellow] Yellow
+      >
+      """
+    And the output should contain
+      """
+      Array
+      (
+          [0] => blue
+      )
+      """

features/non-interactive.feature

@@ -69,3 +69,17 @@ Feature: It is possible to interactively fill in a form from the CLI
           )
       )
       """
+
+  Scenario: Non-compound form type in non-interactive mode
+    When I run a command non-interactively with parameters
+      | Parameter   | Value                   |
+      | command     | form:non_compound_color |
+      | --color     | blue                    |
+    Then the command has finished successfully
+    And the output should contain
+      """
+      Array
+      (
+          [0] => blue
+      )
+      """

src/Console/Input/FormBasedInputDefinitionFactory.php

@@ -35,19 +35,28 @@ public function createForFormType(string $formType, array &$resources = []): Inp
 
         $inputDefinition = new InputDefinition();
 
+        if (!$form->getConfig()->getCompound()) {
+            $this->addFormToInputDefinition($form->getName(), $form, $inputDefinition);
+        }
+
         foreach ($form->all() as $name => $field) {
-            if (!$this->isFormFieldSupported($field)) {
-                continue;
-            }
+            $this->addFormToInputDefinition($name, $field, $inputDefinition);
+        }
 
-            $type = InputOption::VALUE_REQUIRED;
-            $default = $this->resolveDefaultValue($field);
-            $description = FormUtil::label($field);
+        return $inputDefinition;
+    }
 
-            $inputDefinition->addOption(new InputOption($name, null, $type, $description, $default));
+    private function addFormToInputDefinition(string $name, FormInterface $form, InputDefinition $inputDefinition): void
+    {
+        if (!$this->isFormFieldSupported($form)) {
+            return;
         }
 
-        return $inputDefinition;
+        $type = InputOption::VALUE_REQUIRED;
+        $default = $this->resolveDefaultValue($form);
+        $description = FormUtil::label($form);
+
+        $inputDefinition->addOption(new InputOption($name, null, $type, $description, $default));
     }
 
     private function isFormFieldSupported(FormInterface $field): bool

test/Form/NonCompoundColorType.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Matthias\SymfonyConsoleForm\Tests\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class NonCompoundColorType extends AbstractType
+{
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'label' => 'Select color',
+            'choices' => [
+                'Red' => 'red',
+                'Blue' => 'blue',
+                'Yellow' => 'yellow',
+            ],
+            'data' => 'red',
+        ]);
+    }
+
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'color';
+    }
+}

test/config.yml

@@ -50,6 +50,14 @@ services:
         tags:
             - { name: console.command }
 
+    non_compound_color_command:
+        class: Matthias\SymfonyConsoleForm\Tests\Command\PrintFormDataCommand
+        arguments:
+            - Matthias\SymfonyConsoleForm\Tests\Form\NonCompoundColorType
+            - non_compound_color
+        tags:
+            - { name: console.command }
+
     multi_select_command:
         class: Matthias\SymfonyConsoleForm\Tests\Command\PrintFormDataCommand
         arguments: