From 4d2930e52abc729440dbec52c8c2c036bb399f21 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 20 Jan 2016 20:58:57 +0100 Subject: [PATCH] make tests compatible with Symfony 2.8 and 3.0 --- .../Tests/Extension/Core/Type/ChoiceTypeTest.php | 6 +++--- .../Form/Tests/Fixtures/ChoiceSubType.php | 14 +++----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php index a2e5649230095..6c3c89f4686e1 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -14,7 +14,6 @@ use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView; use Symfony\Component\Form\ChoiceList\View\ChoiceView; use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList; -use Symfony\Component\Form\Tests\Fixtures\ChoiceSubType; class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase { @@ -1914,14 +1913,15 @@ public function testInitializeWithDefaultObjectChoice() public function testCustomChoiceTypeDoesNotInheritChoiceLabels() { $builder = $this->factory->createBuilder(); - $builder->add('choice', 'choice', array( + $builder->add('choice', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array( 'choices' => array( '1' => '1', '2' => '2', ), + 'choices_as_values' => true, ) ); - $builder->add('subChoice', new ChoiceSubType()); + $builder->add('subChoice', 'Symfony\Component\Form\Tests\Fixtures\ChoiceSubType'); $form = $builder->getForm(); // The default 'choices' normalizer would fill the $choiceLabels, but it has been replaced diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php index 857dd5d5a77eb..0227cd71cc4cd 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php +++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php @@ -16,7 +16,7 @@ /** * @author Paráda József - */ + */ class ChoiceSubType extends AbstractType { /** @@ -24,7 +24,7 @@ class ChoiceSubType extends AbstractType */ public function configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array('expanded' => true)); + $resolver->setDefaults(array('expanded' => true, 'choices_as_values' => true)); $resolver->setNormalizer('choices', function () { return array( 'attr1' => 'Attribute 1', @@ -33,19 +33,11 @@ public function configureOptions(OptionsResolver $resolver) }); } - /** - * {@inheritdoc} - */ - public function getName() - { - return 'sub_choice'; - } - /** * {@inheritdoc} */ public function getParent() { - return 'choice'; + return 'Symfony\Component\Form\Extension\Core\Type\ChoiceType'; } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy