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

fix test suite by disabling a broken feature

Browse Source
This commit is contained in:
William Durand 2015-10-22 22:46:25 +02:00
parent 96e7d1a201
commit 716f3f19de
No known key found for this signature in database
GPG Key ID: A509BCF1C1274F3B
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Parser/FormTypeParser.php
View File

@ -15,7 +15,9 @@ use Nelmio\ApiDocBundle\DataTypes;
use Symfony\Component\Form\Exception\FormException; use Symfony\Component\Form\Exception\FormException;
use Symfony\Component\Form\Exception\InvalidArgumentException; use Symfony\Component\Form\Exception\InvalidArgumentException;
use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface; use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface as LegacyChoiceListInterface;
use Symfony\Component\Form\Extension\Core\View\ChoiceView; use Symfony\Component\Form\Extension\Core\View\ChoiceView;
use Symfony\Component\Form\Form; use Symfony\Component\Form\Form;
use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\Form\FormFactoryInterface;
@ -152,7 +154,7 @@ class FormTypeParser implements ParserInterface
$bestType = sprintf('array of %ss', $subType); $bestType = sprintf('array of %ss', $subType);
} else { } else {
// Embedded form collection // Embedded form collection
$embbededType = $config->getOption('type'); $embbededType = $config->getOption('type');
$subForm = $this->formFactory->create($embbededType, null, $config->getOption('options', array())); $subForm = $this->formFactory->create($embbededType, null, $config->getOption('options', array()));
$children = $this->parseForm($subForm); $children = $this->parseForm($subForm);
$actualType = DataTypes::COLLECTION; $actualType = DataTypes::COLLECTION;
@ -260,12 +262,15 @@ class FormTypeParser implements ParserInterface
if (($choices = $config->getOption('choices')) && is_array($choices) && count($choices)) { if (($choices = $config->getOption('choices')) && is_array($choices) && count($choices)) {
$parameters[$name]['format'] = json_encode($choices); $parameters[$name]['format'] = json_encode($choices);
} elseif (($choiceList = $config->getOption('choice_list')) && $choiceList instanceof ChoiceListInterface) { } elseif ($choiceList = $config->getOption('choice_list')) {
if (('entity' === $config->getType()->getName() && false === $this->entityToChoice)) { if (('entity' === $config->getType()->getName() && false === $this->entityToChoice)) {
$choices = array(); $choices = array();
} else { } else {
$choices = $this->handleChoiceListValues($choiceList); // TODO: fixme
// does not work since: https://github.com/symfony/symfony/commit/03efce1b568379eac21d880e427090e43035f505
$choices = [];
} }
if (is_array($choices) && count($choices)) { if (is_array($choices) && count($choices)) {
$parameters[$name]['format'] = json_encode($choices); $parameters[$name]['format'] = json_encode($choices);
} }

2
Tests/Fixtures/Form/ImprovedTestType.php
View File

@ -26,7 +26,7 @@ class ImprovedTestType extends AbstractType
->add('c1', 'choice', array('choices' => array('m' => 'Male', 'f' => 'Female'))) ->add('c1', 'choice', array('choices' => array('m' => 'Male', 'f' => 'Female')))
->add('c2', 'choice', array('choices' => array('m' => 'Male', 'f' => 'Female'), 'multiple' => true)) ->add('c2', 'choice', array('choices' => array('m' => 'Male', 'f' => 'Female'), 'multiple' => true))
->add('c3', 'choice', array('choices' => array())) ->add('c3', 'choice', array('choices' => array()))
->add('c4', 'choice', array('choice_list' => new SimpleChoiceList(array('foo' => 'bar', 'bazgroup' => array('baz' => 'Buzz'))))) ->add('c4', 'choice', array('choices' => array('foo' => 'bar', 'bazgroup' => array('baz' => 'Buzz'))))
->add('e1', new EntityType(), array('choice_list' => new SimpleChoiceList(array('foo' => 'bar', 'bazgroup' => array('baz' => 'Buzz'))))) ->add('e1', new EntityType(), array('choice_list' => new SimpleChoiceList(array('foo' => 'bar', 'bazgroup' => array('baz' => 'Buzz')))))
; ;
} }

6
Tests/Parser/FormTypeParserTest.php
View File

@ -79,10 +79,6 @@ class FormTypeParserTest extends \PHPUnit_Framework_TestCase
'readonly' => false 'readonly' => false
); );
if ($entityToChoice) {
$entityData['format'] = json_encode(array('foo' => 'bar', 'baz' => 'Buzz'));
}
return array( return array(
array( array(
array('class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Form\TestType', 'options' => array()), array('class' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Form\TestType', 'options' => array()),
@ -434,7 +430,7 @@ class FormTypeParserTest extends \PHPUnit_Framework_TestCase
'required' => true, 'required' => true,
'description' => '', 'description' => '',
'readonly' => false, 'readonly' => false,
'format' => json_encode(array('foo' => 'bar', 'baz' => 'Buzz')), 'format' => '{"foo":"bar","bazgroup":{"baz":"Buzz"}}',
), ),
'e1' => $entityData 'e1' => $entityData
), ),