diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Form] Deprecated setting "choices_as_values" to "false"

This commit is contained in:
Bernhard Schussek 2015-11-26 11:53:06 +01:00 committed by Nicolas Grekas
parent d65b92469e
commit 3ab8189080
12 changed files with 298 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
View File

@ -74,6 +74,12 @@ class ArrayChoiceList implements ChoiceListInterface
$choices = iterator_to_array($choices);
}
if (null === $value && $this->castableToString($choices)) {
$value = function ($choice) {
return (string) $choice;
};
}
if (null !== $value) {
// If a deterministic value generator was passed, use it later
$this->valueCallback = $value;
@ -207,4 +213,35 @@ class ArrayChoiceList implements ChoiceListInterface
$structuredValues[$key] = $choiceValue;
}
}
/**
* Checks whether the given choices can be cast to strings without
* generating duplicates.
*
* @param array $choices The choices.
* @param array|null $cache The cache for previously checked entries. Internal
*
* @return bool Returns true if the choices can be cast to strings and
* false otherwise.
*/
private function castableToString(array $choices, array &$cache = array())
{
foreach ($choices as $choice) {
if (is_array($choice)) {
if (!$this->castableToString($choice, $cache)) {
return false;
}
continue;
} elseif (!is_scalar($choice)) {
return false;
} elseif (isset($cache[(string) $choice])) {
return false;
}
$cache[(string) $choice] = true;
}
return true;
}
}

3
src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
View File

@ -23,7 +23,8 @@ class CountryType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => Intl::getRegionBundle()->getCountryNames(),
'choices' => array_flip(Intl::getRegionBundle()->getCountryNames()),
'choices_as_values' => true,
'choice_translation_domain' => false,
));
}

3
src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
View File

@ -23,7 +23,8 @@ class CurrencyType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => Intl::getCurrencyBundle()->getCurrencyNames(),
'choices' => array_flip(Intl::getCurrencyBundle()->getCurrencyNames()),
'choices_as_values' => true,
'choice_translation_domain' => false,
));
}

16
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View File

@ -88,10 +88,13 @@ class DateType extends AbstractType
if ('choice' === $options['widget']) {
// Only pass a subset of the options to children
$yearOptions['choices'] = $this->formatTimestamps($formatter, '/y+/', $this->listYears($options['years']));
$yearOptions['choices_as_values'] = true;
$yearOptions['placeholder'] = $options['placeholder']['year'];
$monthOptions['choices'] = $this->formatTimestamps($formatter, '/[M|L]+/', $this->listMonths($options['months']));
$monthOptions['choices_as_values'] = true;
$monthOptions['placeholder'] = $options['placeholder']['month'];
$dayOptions['choices'] = $this->formatTimestamps($formatter, '/d+/', $this->listDays($options['days']));
$dayOptions['choices_as_values'] = true;
$dayOptions['placeholder'] = $options['placeholder']['day'];
}
@ -262,6 +265,7 @@ class DateType extends AbstractType
{
$pattern = $formatter->getPattern();
$timezone = $formatter->getTimezoneId();
$formattedTimestamps = array();
if ($setTimeZone = PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {
$formatter->setTimeZone('UTC');
@ -272,8 +276,8 @@ class DateType extends AbstractType
if (preg_match($regex, $pattern, $matches)) {
$formatter->setPattern($matches[0]);
foreach ($timestamps as $key => $timestamp) {
$timestamps[$key] = $formatter->format($timestamp);
foreach ($timestamps as $timestamp => $choice) {
$formattedTimestamps[$formatter->format($timestamp)] = $choice;
}
// I'd like to clone the formatter above, but then we get a
@ -287,7 +291,7 @@ class DateType extends AbstractType
$formatter->setTimeZoneId($timezone);
}
return $timestamps;
return $formattedTimestamps;
}
private function listYears(array $years)
@ -296,7 +300,7 @@ class DateType extends AbstractType
foreach ($years as $year) {
if (false !== $y = gmmktime(0, 0, 0, 6, 15, $year)) {
$result[$year] = $y;
$result[$y] = $year;
}
}
@ -308,7 +312,7 @@ class DateType extends AbstractType
$result = array();
foreach ($months as $month) {
$result[$month] = gmmktime(0, 0, 0, $month, 15);
$result[gmmktime(0, 0, 0, $month, 15)] = $month;
}
return $result;
@ -319,7 +323,7 @@ class DateType extends AbstractType
$result = array();
foreach ($days as $day) {
$result[$day] = gmmktime(0, 0, 0, 5, $day);
$result[gmmktime(0, 0, 0, 5, $day)] = $day;
}
return $result;

3
src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
View File

@ -23,7 +23,8 @@ class LanguageType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => Intl::getLanguageBundle()->getLanguageNames(),
'choices' => array_flip(Intl::getLanguageBundle()->getLanguageNames()),
'choices_as_values' => true,
'choice_translation_domain' => false,
));
}

3
src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
View File

@ -23,7 +23,8 @@ class LocaleType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => Intl::getLocaleBundle()->getLocaleNames(),
'choices' => array_flip(Intl::getLocaleBundle()->getLocaleNames()),
'choices_as_values' => true,
'choice_translation_domain' => false,
));
}

9
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View File

@ -58,19 +58,21 @@ class TimeType extends AbstractType
$hours = $minutes = array();
foreach ($options['hours'] as $hour) {
$hours[$hour] = str_pad($hour, 2, '0', STR_PAD_LEFT);
$hours[str_pad($hour, 2, '0', STR_PAD_LEFT)] = $hour;
}
// Only pass a subset of the options to children
$hourOptions['choices'] = $hours;
$hourOptions['choices_as_values'] = true;
$hourOptions['placeholder'] = $options['placeholder']['hour'];
if ($options['with_minutes']) {
foreach ($options['minutes'] as $minute) {
$minutes[$minute] = str_pad($minute, 2, '0', STR_PAD_LEFT);
$minutes[str_pad($minute, 2, '0', STR_PAD_LEFT)] = $minute;
}
$minuteOptions['choices'] = $minutes;
$minuteOptions['choices_as_values'] = true;
$minuteOptions['placeholder'] = $options['placeholder']['minute'];
}
@ -78,10 +80,11 @@ class TimeType extends AbstractType
$seconds = array();
foreach ($options['seconds'] as $second) {
$seconds[$second] = str_pad($second, 2, '0', STR_PAD_LEFT);
$seconds[str_pad($second, 2, '0', STR_PAD_LEFT)] = $second;
}
$secondOptions['choices'] = $seconds;
$secondOptions['choices_as_values'] = true;
$secondOptions['placeholder'] = $options['placeholder']['second'];
}

46
src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
View File

@ -23,13 +23,21 @@ class TimezoneType extends AbstractType
*/
private static $timezones;
/**
* Stores the available timezone choices.
*
* @var array
*/
private static $flippedTimezones;
/**
* {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'choices' => self::getTimezones(),
'choices' => self::getFlippedTimezones(),
'choices_as_values' => true,
'choice_translation_domain' => false,
));
}
@ -85,4 +93,40 @@ class TimezoneType extends AbstractType
return static::$timezones;
}
/**
* Returns the timezone choices.
*
* The choices are generated from the ICU function
* \DateTimeZone::listIdentifiers(). They are cached during a single request,
* so multiple timezone fields on the same page don't lead to unnecessary
* overhead.
*
* @return array The timezone choices
*/
private static function getFlippedTimezones()
{
if (null === self::$timezones) {
self::$timezones = array();
foreach (\DateTimeZone::listIdentifiers() as $timezone) {
$parts = explode('/', $timezone);
if (count($parts) > 2) {
$region = $parts[0];
$name = $parts[1].' - '.$parts[2];
} elseif (count($parts) > 1) {
$region = $parts[0];
$name = $parts[1];
} else {
$region = 'Other';
$name = $parts[0];
}
self::$timezones[$region][str_replace('_', ' ', $name)] = $timezone;
}
}
return self::$timezones;
}
}

48
src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
View File

@ -65,6 +65,40 @@ class ArrayChoiceListTest extends AbstractChoiceListTest
$this->assertSame(array(1 => ':foo', 2 => ':baz'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 'baz')));
}
public function testCreateChoiceListWithoutValueCallbackAndDuplicateFreeToStringChoices()
{
$choiceList = new ArrayChoiceList(array(2 => 'foo', 7 => 'bar', 10 => 123));
$this->assertSame(array('foo', 'bar', '123'), $choiceList->getValues());
$this->assertSame(array('foo' => 'foo', 'bar' => 'bar', '123' => 123), $choiceList->getChoices());
$this->assertSame(array('foo' => 2, 'bar' => 7, '123' => 10), $choiceList->getOriginalKeys());
$this->assertSame(array(1 => 'foo', 2 => 123), $choiceList->getChoicesForValues(array(1 => 'foo', 2 => '123')));
$this->assertSame(array(1 => 'foo', 2 => '123'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 123)));
}
public function testCreateChoiceListWithoutValueCallbackAndToStringDuplicates()
{
$choiceList = new ArrayChoiceList(array(2 => 'foo', 7 => '123', 10 => 123));
$this->assertSame(array('0', '1', '2'), $choiceList->getValues());
$this->assertSame(array('0' => 'foo', '1' => '123', '2' => 123), $choiceList->getChoices());
$this->assertSame(array('0' => 2, '1' => 7, '2' => 10), $choiceList->getOriginalKeys());
$this->assertSame(array(1 => 'foo', 2 => 123), $choiceList->getChoicesForValues(array(1 => '0', 2 => '2')));
$this->assertSame(array(1 => '0', 2 => '2'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => 123)));
}
public function testCreateChoiceListWithoutValueCallbackAndMixedChoices()
{
$object = new \stdClass();
$choiceList = new ArrayChoiceList(array(2 => 'foo', 5 => array(7 => '123'), 10 => $object));
$this->assertSame(array('0', '1', '2'), $choiceList->getValues());
$this->assertSame(array('0' => 'foo', '1' => '123', '2' => $object), $choiceList->getChoices());
$this->assertSame(array('0' => 2, '1' => 7, '2' => 10), $choiceList->getOriginalKeys());
$this->assertSame(array(1 => 'foo', 2 => $object), $choiceList->getChoicesForValues(array(1 => '0', 2 => '2')));
$this->assertSame(array(1 => '0', 2 => '2'), $choiceList->getValuesForChoices(array(1 => 'foo', 2 => $object)));
}
public function testCreateChoiceListWithGroupedChoices()
{
$choiceList = new ArrayChoiceList(array(
@ -72,15 +106,15 @@ class ArrayChoiceListTest extends AbstractChoiceListTest
'Group 2' => array('C' => 'c', 'D' => 'd'),
));
$this->assertSame(array('0', '1', '2', '3'), $choiceList->getValues());
$this->assertSame(array('a', 'b', 'c', 'd'), $choiceList->getValues());
$this->assertSame(array(
'Group 1' => array('A' => '0', 'B' => '1'),
'Group 2' => array('C' => '2', 'D' => '3'),
'Group 1' => array('A' => 'a', 'B' => 'b'),
'Group 2' => array('C' => 'c', 'D' => 'd'),
), $choiceList->getStructuredValues());
$this->assertSame(array(0 => 'a', 1 => 'b', 2 => 'c', 3 => 'd'), $choiceList->getChoices());
$this->assertSame(array(0 => 'A', 1 => 'B', 2 => 'C', 3 => 'D'), $choiceList->getOriginalKeys());
$this->assertSame(array(1 => 'a', 2 => 'b'), $choiceList->getChoicesForValues(array(1 => '0', 2 => '1')));
$this->assertSame(array(1 => '0', 2 => '1'), $choiceList->getValuesForChoices(array(1 => 'a', 2 => 'b')));
$this->assertSame(array('a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd'), $choiceList->getChoices());
$this->assertSame(array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D'), $choiceList->getOriginalKeys());
$this->assertSame(array(1 => 'a', 2 => 'b'), $choiceList->getChoicesForValues(array(1 => 'a', 2 => 'b')));
$this->assertSame(array(1 => 'a', 2 => 'b'), $choiceList->getValuesForChoices(array(1 => 'a', 2 => 'b')));
}
public function testCompareChoicesByIdentityByDefault()

6
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
View File

@ -20,7 +20,7 @@ class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$list = new ArrayChoiceList(array('', 0, 'X'));
$list = new ArrayChoiceList(array('', false, 'X'));
$this->transformer = new ChoiceToValueTransformer($list);
}
@ -35,7 +35,7 @@ class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase
return array(
// more extensive test set can be found in FormUtilTest
array('', '0'),
array(0, '1'),
array(false, '1'),
);
}
@ -53,7 +53,7 @@ class ChoiceToValueTransformerTest extends \PHPUnit_Framework_TestCase
// values are expected to be valid choice keys already and stay
// the same
array('0', ''),
array('1', 0),
array('1', false),
array('2', 'X'),
);
}

6
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
View File

@ -20,7 +20,7 @@ class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$list = new ArrayChoiceList(array('A', 'B', 'C'));
$list = new ArrayChoiceList(array('', false, 'X'));
$this->transformer = new ChoicesToValuesTransformer($list);
}
@ -31,7 +31,7 @@ class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
public function testTransform()
{
$in = array('A', 'B', 'C');
$in = array('', false, 'X');
$out = array('0', '1', '2');
$this->assertSame($out, $this->transformer->transform($in));
@ -54,7 +54,7 @@ class ChoicesToValuesTransformerTest extends \PHPUnit_Framework_TestCase
{
// values are expected to be valid choices and stay the same
$in = array('0', '1', '2');
$out = array('A', 'B', 'C');
$out = array('', false, 'X');
$this->assertSame($out, $this->transformer->reverseTransform($in));
}

169
src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
View File

@ -18,14 +18,14 @@ use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
private $choices = array(
'a' => 'Bernhard',
'b' => 'Fabien',
'c' => 'Kris',
'd' => 'Jon',
'e' => 'Roman',
'Bernhard' => 'a',
'Fabien' => 'b',
'Kris' => 'c',
'Jon' => 'd',
'Roman' => 'e',
);
private $numericChoices = array(
private $numericChoicesFlipped = array(
0 => 'Bernhard',
1 => 'Fabien',
2 => 'Kris',
@ -36,6 +36,18 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
private $objectChoices;
protected $groupedChoices = array(
'Symfony' => array(
'Bernhard' => 'a',
'Fabien' => 'b',
'Kris' => 'c',
),
'Doctrine' => array(
'Jon' => 'd',
'Roman' => 'e',
),
);
protected $groupedChoicesFlipped = array(
'Symfony' => array(
'a' => 'Bernhard',
'b' => 'Fabien',
@ -107,6 +119,20 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('choice', null, array(
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$this->assertCount(count($this->choices), $form, 'Each choice should become a new field');
}
/**
* @group legacy
*/
public function testExpandedFlippedChoicesOptionsTurnIntoChildren()
{
$form = $this->factory->create('choice', null, array(
'expanded' => true,
'choices' => array_flip($this->choices),
));
$this->assertCount(count($this->choices), $form, 'Each choice should become a new field');
@ -119,6 +145,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$this->assertTrue(isset($form['placeholder']));
@ -132,6 +159,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$this->assertFalse(isset($form['placeholder']));
@ -145,6 +173,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$this->assertFalse(isset($form['placeholder']));
@ -158,9 +187,10 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => array(
'' => 'Empty',
1 => 'Not empty',
'Empty' => '',
'Not empty' => 1,
),
'choices_as_values' => true,
));
$this->assertFalse(isset($form['placeholder']));
@ -172,6 +202,29 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('choice', null, array(
'expanded' => true,
'choices' => $this->groupedChoices,
'choices_as_values' => true,
));
$flattened = array();
foreach ($this->groupedChoices as $choices) {
$flattened = array_merge($flattened, array_keys($choices));
}
$this->assertCount($form->count(), $flattened, 'Each nested choice should become a new field, not the groups');
foreach ($flattened as $value => $choice) {
$this->assertTrue($form->has($value), 'Flattened choice is named after it\'s value');
}
}
/**
* @group legacy
*/
public function testExpandedChoicesFlippedOptionsAreFlattened()
{
$form = $this->factory->create('choice', null, array(
'expanded' => true,
'choices' => $this->groupedChoicesFlipped,
));
$flattened = array();
@ -219,6 +272,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
foreach ($form as $child) {
@ -233,6 +287,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
foreach ($form as $child) {
@ -247,6 +302,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
foreach ($form as $child) {
@ -260,6 +316,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('b');
@ -275,6 +332,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('foobar');
@ -290,6 +348,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(null);
@ -308,6 +367,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(null);
@ -323,6 +383,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('');
@ -338,8 +399,9 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => array(
'EMPTY_CHOICE' => 'Empty',
'Empty' => 'EMPTY_CHOICE',
),
'choices_as_values' => true,
'choice_value' => function () {
return '';
},
@ -361,6 +423,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit('');
@ -376,6 +439,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(false);
@ -394,6 +458,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(false);
@ -455,6 +520,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array('a', 'b'));
@ -470,6 +536,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array());
@ -488,6 +555,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(array());
@ -503,6 +571,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('foobar');
@ -518,6 +587,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array('a', 'foobar'));
@ -578,6 +648,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('b');
@ -606,6 +677,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('foobar');
@ -634,6 +706,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('b');
@ -664,6 +737,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('foobar');
@ -692,6 +766,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(null);
@ -723,6 +798,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(null);
@ -740,6 +816,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('');
@ -771,6 +848,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit('');
@ -788,6 +866,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(false);
@ -819,6 +898,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => true,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(false);
@ -836,6 +916,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(null);
@ -869,6 +950,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(null);
@ -886,6 +968,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('');
@ -919,6 +1002,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit('');
@ -936,6 +1020,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(false);
@ -969,6 +1054,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => true,
'required' => false,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(false);
@ -985,9 +1071,10 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'expanded' => true,
'choices' => array(
'' => 'Empty',
1 => 'Not empty',
'Empty' => '',
'Not empty' => 1,
),
'choices_as_values' => true,
));
$form->submit('');
@ -1065,12 +1152,15 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$this->assertNull($form[4]->getViewData());
}
public function testSubmitSingleExpandedNumericChoices()
/**
* @group legacy
*/
public function testSubmitSingleExpandedNumericChoicesFlipped()
{
$form = $this->factory->create('choice', null, array(
'multiple' => false,
'expanded' => true,
'choices' => $this->numericChoices,
'choices' => $this->numericChoicesFlipped,
));
$form->submit('1');
@ -1096,6 +1186,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array('a', 'c'));
@ -1123,6 +1214,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit('foobar');
@ -1150,6 +1242,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array('a', 'foobar'));
@ -1177,6 +1270,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$form->submit(array());
@ -1205,6 +1299,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => array(),
'choices_as_values' => true,
));
$form->submit(array());
@ -1219,10 +1314,11 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => true,
'choices' => array(
'' => 'Empty',
1 => 'Not Empty',
2 => 'Not Empty 2',
'Empty' => '',
'Not Empty' => 1,
'Not Empty 2' => 2,
),
'choices_as_values' => true,
));
$form->submit(array('', '2'));
@ -1302,12 +1398,15 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$this->assertNull($form[4]->getViewData());
}
/**
* @group legacy
*/
public function testSubmitMultipleExpandedNumericChoices()
{
$form = $this->factory->create('choice', null, array(
'multiple' => true,
'expanded' => true,
'choices' => $this->numericChoices,
'choices' => $this->numericChoicesFlipped,
));
$form->submit(array('1', '2'));
@ -1363,16 +1462,18 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$this->assertFalse($selectedChecker($view->vars['choices'][1]->value, $view->vars['value']));
}
/*
/**
* We need this functionality to create choice fields for Boolean types,
* e.g. false => 'No', true => 'Yes'
* e.g. false => 'No', true => 'Yes'.
*
* @group legacy
*/
public function testSetDataSingleNonExpandedAcceptsBoolean()
{
$form = $this->factory->create('choice', null, array(
'multiple' => false,
'expanded' => false,
'choices' => $this->numericChoices,
'choices' => $this->numericChoicesFlipped,
));
$form->setData(false);
@ -1382,12 +1483,15 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$this->assertTrue($form->isSynchronized());
}
/**
* @group legacy
*/
public function testSetDataMultipleNonExpandedAcceptsBoolean()
{
$form = $this->factory->create('choice', null, array(
'multiple' => true,
'expanded' => false,
'choices' => $this->numericChoices,
'choices' => $this->numericChoicesFlipped,
));
$form->setData(array(false, true));
@ -1401,6 +1505,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$form = $this->factory->create('choice', null, array(
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1412,6 +1517,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('choice', null, array(
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1423,6 +1529,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('choice', null, array(
'multiple' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1434,6 +1541,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('choice', null, array(
'expanded' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1444,6 +1552,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$form = $this->factory->create('choice', null, array(
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1454,6 +1563,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$form = $this->factory->create('choice', null, array(
'choices' => $this->choices,
'choices_as_values' => true,
'choice_translation_domain' => true,
));
$view = $form->createView();
@ -1465,6 +1575,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$form = $this->factory->create('choice', null, array(
'choices' => $this->choices,
'choices_as_values' => true,
'translation_domain' => 'foo',
));
$view = $form->createView();
@ -1491,6 +1602,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'required' => true,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1503,6 +1615,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => false,
'required' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1520,6 +1633,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'required' => $required,
'placeholder' => $placeholder,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1539,6 +1653,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'required' => $required,
'empty_value' => $placeholder,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1558,7 +1673,8 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'expanded' => $expanded,
'required' => $required,
'placeholder' => $placeholder,
'choices' => array('a' => 'A', '' => 'Empty'),
'choices' => array('A' => 'a', 'Empty' => ''),
'choices_as_values' => true,
));
$view = $form->createView();
@ -1612,9 +1728,10 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
public function testPassChoicesToView()
{
$choices = array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D');
$choices = array('A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd');
$form = $this->factory->create('choice', null, array(
'choices' => $choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1628,9 +1745,10 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
public function testPassPreferredChoicesToView()
{
$choices = array('a' => 'A', 'b' => 'B', 'c' => 'C', 'd' => 'D');
$choices = array('A' => 'a', 'B' => 'b', 'C' => 'c', 'D' => 'd');
$form = $this->factory->create('choice', null, array(
'choices' => $choices,
'choices_as_values' => true,
'preferred_choices' => array('b', 'd'),
));
$view = $form->createView();
@ -1649,6 +1767,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$form = $this->factory->create('choice', null, array(
'choices' => $this->groupedChoices,
'choices_as_values' => true,
'preferred_choices' => array('b', 'd'),
));
$view = $form->createView();
@ -1700,6 +1819,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
'multiple' => true,
'expanded' => false,
'choices' => $this->choices,
'choices_as_values' => true,
));
$view = $form->createView();
@ -1711,6 +1831,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{
$this->factory->createNamed('name', 'choice', null, array(
'choices' => array(),
'choices_as_values' => true,
));
}