Merge branch '3.0'

fabpot · fabpot · commit 64515b8049c6 · 2016-01-21T07:33:52.000+01:00
* 3.0:
  make tests compatible with Symfony 2.8 and 3.0
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
-use Symfony\Component\Form\Tests\Fixtures\ChoiceSubType;
 
 class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
 {
@@ -1491,14 +1490,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
@@ -16,15 +16,15 @@
 
 /**
  * @author Paráda József <joczy.parada@gmail.com>
- */ 
+ */
 class ChoiceSubType extends AbstractType
 {
     /**
      * {@inheritdoc}
      */
     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';
     }
 }
