RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 23:59:26 +03:00
Code Issues Projects Releases Wiki Activity

FIX #1428 Make sure FormInterfaceConfig has a 'documentation' option … (#1429)

Browse Source 
* FIX #1428 Make sure FormInterfaceConfig has a 'documentation' option before getting it

FIX #1428

* adding SubmitType to Tests

* Update UserType.php

* Update UserType.php

* Update FunctionalTest.php

* Update FunctionalTest.php

* removed check to see how unit test handles this

* Add test back

* Cs
This commit is contained in:
neFAST 2019-03-07 08:48:56 +01:00 committed by Guilhem N
parent 0fe8373d53
commit 92790b1d28
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ModelDescriber/FormModelDescriber.php
View File

@ -75,7 +75,10 @@ final class FormModelDescriber implements ModelDescriberInterface, ModelRegistry
$schema->setRequired($required); $schema->setRequired($required);
} }
$property->merge($config->getOption('documentation')); if ($config->hasOption('documentation')) {
$property->merge($config->getOption('documentation'));
}
if (null !== $property->getType()) { if (null !== $property->getType()) {
continue; // Type manually defined continue; // Type manually defined
} }

4
Tests/Functional/Form/UserType.php
View File

@ -14,6 +14,7 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Form;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\User; use Nelmio\ApiDocBundle\Tests\Functional\Entity\User;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@ -40,7 +41,8 @@ class UserType extends AbstractType
->add('entities', EntityType::class, ['class' => 'Entity', 'multiple' => true]) ->add('entities', EntityType::class, ['class' => 'Entity', 'multiple' => true])
->add('document', DocumentType::class, ['class' => 'Document']) ->add('document', DocumentType::class, ['class' => 'Document'])
->add('documents', DocumentType::class, ['class' => 'Document', 'multiple' => true]) ->add('documents', DocumentType::class, ['class' => 'Document', 'multiple' => true])
->add('extended_builtin', ExtendedBuiltinType::class, ['required_option' => 'foo']); ->add('extended_builtin', ExtendedBuiltinType::class, ['required_option' => 'foo'])
->add('save', SubmitType::class);
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)

2
Tests/Functional/FunctionalTest.php
View File

@ -274,6 +274,8 @@ class FunctionalTest extends WebTestCase
'type' => 'string', 'type' => 'string',
'enum' => ['foo', 'bar'], 'enum' => ['foo', 'bar'],
], ],
'save' => [
],
], ],
'required' => ['dummy', 'dummies', 'entity', 'entities', 'document', 'documents', 'extended_builtin'], 'required' => ['dummy', 'dummies', 'entity', 'entities', 'document', 'documents', 'extended_builtin'],
], $this->getModel('UserType')->toArray()); ], $this->getModel('UserType')->toArray());