added test case

Author: oleg-andreyev

composer.json

@@ -37,6 +37,7 @@
         "symfony/validator": "~5.0",
         "symfony/yaml": "~5.0",
         "symfony/security-csrf": "~5.0",
-        "phpunit/phpunit": "^7"
+        "phpunit/phpunit": "^7",
+        "doctrine/collections": "^1.6"
     }
 }

features/interactive.feature

@@ -202,6 +202,35 @@ Feature: It is possible to interactively fill in a form from the CLI
       [name] => Jelmer
       """
 
+  Scenario: Form Type with ArrayCollection
+    When I run the command "form:array_collection_form_addresses" and I provide as input
+    | Input |
+    | y     |
+    | foo   |
+    | y     |
+    | bar   |
+    | n     |
+    And the output should contain
+      """
+        Matthias\SymfonyConsoleForm\Tests\Model\Addresses Object
+        (
+            [addresses] => Doctrine\Common\Collections\ArrayCollection Object
+            (
+                [elements:Doctrine\Common\Collections\ArrayCollection:private] => Array
+                (
+                    [0] => Matthias\SymfonyConsoleForm\Tests\Form\Data\Address Object
+                    (
+                        [street] => foo
+                    )
+                    [1] => Matthias\SymfonyConsoleForm\Tests\Form\Data\Address Object
+                    (
+                        [street] => bar
+                    )
+                )
+            )
+        )
+      """
+
   Scenario: Remove an address from pre filled collection of blocked addresses
     When I run the command "form:blocked_addresses" and I provide as input
       | Input |

src/Bridge/Interaction/CollectionInteractor.php

@@ -50,8 +50,10 @@ public function interactWith(
             throw new CanNotInteractWithForm('Expected a "collection" form');
         }
 
-        $data = $form->getData();
-        if (!$form->getConfig()->getOption('allow_add') && empty($data)) {
+        $config = $form->getConfig();
+        $data = $form->getData() ?: $config->getEmptyData();
+
+        if (!$config->getOption('allow_add') && empty($data)) {
             throw new FormNotReadyForInteraction(
                 'The "collection" form should have the option "allow_add" or have existing entries'
             );
@@ -66,7 +68,7 @@ public function interactWith(
         $this->printHeader($form, $output);
 
         $submittedData = [];
-        $prototype = $form->getConfig()->getAttribute('prototype');
+        $prototype = $config->getAttribute('prototype');
         $originalData = $prototype->getData();
 
         $askIfEntryNeedsToBeSubmitted = function ($entryNumber) use ($helperSet, $input, $output) {
@@ -78,12 +80,12 @@ public function interactWith(
             $prototype->setData($entryData);
 
             $submittedEntry = $this->formInteractor->interactWith($prototype, $helperSet, $input, $output);
-            if (!$form->getConfig()->getOption('allow_delete') || $askIfEntryNeedsToBeSubmitted($key)) {
+            if (!$config->getOption('allow_delete') || $askIfEntryNeedsToBeSubmitted($key)) {
                 $submittedData[] = $submittedEntry;
             }
         }
 
-        if ($form->getConfig()->getOption('allow_add')) {
+        if ($config->getOption('allow_add')) {
             // reset the prototype
             $prototype->setData($originalData);
             $key = count($submittedData) - 1;

test/Command/PrintFormDataCommand.php

@@ -12,13 +12,17 @@ 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_iterable($formData)) {
+            $printData = array_map(function ($data) {
+                if ($data instanceof \DateTime) {
+                    return $data->format(\DateTime::ISO8601);
+                }
 
-            return $data;
-        }, (array)$formData);
+                return $data;
+            }, (array)$formData);
+        } else {
+            $printData = $formData;
+        }
 
         $output->write(print_r($printData, true));
 

test/Form/AddressType.php

@@ -5,6 +5,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Matthias\SymfonyConsoleForm\Tests\Form\Data\Address;
 

test/Form/AddressesType.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Form;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Matthias\SymfonyConsoleForm\Tests\Model\Addresses;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class AddressesType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'addresses',
+            CollectionType::class,
+            [
+                'entry_type' => AddressType::class,
+                'allow_add'  => true,
+                'empty_data' => new ArrayCollection()
+            ]
+        );
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('data_class', Addresses::class);
+    }
+}

test/Model/Addresses.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types = 1);
+
+namespace Matthias\SymfonyConsoleForm\Tests\Model;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+class Addresses
+{
+    public $addresses;
+
+    public function __construct()
+    {
+        $this->addresses = new ArrayCollection();
+    }
+}

test/config.yml

@@ -34,6 +34,14 @@ services:
         tags:
             - { name: console.command }
 
+    array_collection_form_addresses:
+        class: Matthias\SymfonyConsoleForm\Tests\Command\PrintFormDataCommand
+        arguments:
+            - Matthias\SymfonyConsoleForm\Tests\Form\AddressesType
+            - array_collection_form_addresses
+        tags:
+            - { name: console.command }
+
     blocked_addresses_command:
         class: Matthias\SymfonyConsoleForm\Tests\Command\PrintFormDataCommand
         arguments: