Merge pull request #1309 from goetas/form-collections

Handle form collection types

ModelDescriber/FormModelDescriber.php

@@ -16,6 +16,7 @@ use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareInterface;
 use Nelmio\ApiDocBundle\Describer\ModelRegistryAwareTrait;
 use Nelmio\ApiDocBundle\Model\Model;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormConfigBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormTypeInterface;
@@ -77,39 +78,55 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
                 continue; // Type manually defined
             }
 
+            $this->findFormType($config, $property);
+        }
+    }
+
+    /**
+     * Finds and sets the schema type on $property based on $config info.
+     *
+     * Returns true if a native Swagger type was found, false otherwise
+     *
+     * @param FormConfigBuilderInterface $config
+     * @param                            $property
+     *
+     * @return bool
+     */
+    private function findFormType(FormConfigBuilderInterface $config, $property): bool
+    {
         for ($type = $config->getType(); null !== $type; $type = $type->getParent()) {
             $blockPrefix = $type->getBlockPrefix();
 
             if ('text' === $blockPrefix) {
                 $property->setType('string');
 
-                    break;
+                return true;
             }
 
             if ('number' === $blockPrefix) {
                 $property->setType('number');
 
-                    break;
+                return true;
             }
 
             if ('integer' === $blockPrefix) {
                 $property->setType('integer');
 
-                    break;
+                return true;
             }
 
             if ('date' === $blockPrefix) {
                 $property->setType('string');
                 $property->setFormat('date');
 
-                    break;
+                return true;
             }
 
             if ('datetime' === $blockPrefix) {
                 $property->setType('string');
                 $property->setFormat('date-time');
 
-                    break;
+                return true;
             }
 
             if ('choice' === $blockPrefix) {
@@ -128,7 +145,7 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
                     }
                 }
 
-                    break;
+                return true;
             }
 
             if ('checkbox' === $blockPrefix) {
@@ -137,13 +154,17 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
 
             if ('collection' === $blockPrefix) {
                 $subType = $config->getOption('entry_type');
+                $subOptions = $config->getOption('entry_options');
+                $subForm = $this->formFactory->create($subType, null, $subOptions);
+
                 $property->setType('array');
+                $itemsProp = $property->getItems();
 
-                    $model = new Model(new Type(Type::BUILTIN_TYPE_OBJECT, false, $subType), null);
+                if (!$this->findFormType($subForm->getConfig(), $itemsProp)) {
-                    $property->getItems()->setRef($this->modelRegistry->register($model));
                     $property->setExample(sprintf('[{%s}]', $subType));
+                }
 
-                    break;
+                return true;
             }
 
             if ('entity' === $blockPrefix) {
@@ -157,7 +178,7 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
                     $property->setFormat(sprintf('%s id', $entityClass));
                 }
 
-                    break;
+                return true;
             }
 
             if ($type->getInnerType() && ($formClass = get_class($type->getInnerType())) && !$this->isBuiltinType($formClass)) {
@@ -165,10 +186,11 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
                 $model = new Model(new Type(Type::BUILTIN_TYPE_OBJECT, false, $formClass));
                 $property->setRef($this->modelRegistry->register($model));
 
-                    break;
+                return false;
-                }
             }
         }
+
+        return false;
     }
 
     /**

Tests/Functional/Form/DummyEmptyType.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the NelmioApiDocBundle package.
+ *
+ * (c) Nelmio
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Nelmio\ApiDocBundle\Tests\Functional\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class DummyEmptyType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+    }
+}

Tests/Functional/Form/UserType.php

@@ -14,6 +14,7 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Form;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\User;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -22,10 +23,18 @@ class UserType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
+            ->add('strings', CollectionType::class, [
+                'entry_type' => TextType::class,
+                'required' => false,
+            ])
             ->add('dummy', DummyType::class)
             ->add('dummies', CollectionType::class, [
                 'entry_type' => DummyType::class,
             ])
+            ->add('empty_dummies', CollectionType::class, [
+                'entry_type' => DummyEmptyType::class,
+                'required' => false,
+            ])
             ->add('quz', DummyType::class, ['documentation' => ['type' => 'string', 'description' => 'User type.'], 'required' => false]);
     }
 

Tests/Functional/FunctionalTest.php

@@ -12,6 +12,7 @@
 namespace Nelmio\ApiDocBundle\Tests\Functional;
 
 use EXSyst\Component\Swagger\Tag;
+use Nelmio\ApiDocBundle\Tests\Functional\Form\DummyEmptyType;
 use Nelmio\ApiDocBundle\Tests\Functional\Form\DummyType;
 
 class FunctionalTest extends WebTestCase
@@ -223,12 +224,21 @@ class FunctionalTest extends WebTestCase
         $this->assertEquals([
             'type' => 'object',
             'properties' => [
+                'strings' => [
+                    'items' => ['type' => 'string'],
+                    'type' => 'array',
+                ],
                 'dummy' => ['$ref' => '#/definitions/DummyType'],
                 'dummies' => [
                     'items' => ['$ref' => '#/definitions/DummyType'],
                     'type' => 'array',
                     'example' => sprintf('[{%s}]', DummyType::class),
                 ],
+                'empty_dummies' => [
+                    'items' => ['$ref' => '#/definitions/DummyEmptyType'],
+                    'type' => 'array',
+                    'example' => sprintf('[{%s}]', DummyEmptyType::class),
+                ],
                 'quz' => [
                     'type' => 'string',
                     'description' => 'User type.',