Use choice_translation_domain in BooleanType (#348)

sonata-project · Oct 4, 2016 · 26c05fd · 26c05fd
1 parent 1b12f54
commit 26c05fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Form/Type/BooleanType.php b/Form/Type/BooleanType.php
@@ -77,10 +77,12 @@ public function configureOptions(OptionsResolver $resolver)
             },
         );
 
-        // SF 2.7+ BC
+        // NEXT_MAJOR: Remove this "if" (when requirement of Symfony is >= 2.7)
         if (method_exists('Symfony\Component\Form\AbstractType', 'configureOptions')) {
             $choices = array_flip($choices);
 
+            $defaultOptions['choice_translation_domain'] = 'SonataCoreBundle';
+
             // choice_as_value options is not needed in SF 3.0+
             if (method_exists('Symfony\Component\Form\FormTypeInterface', 'setDefaultOptions')) {
                 $defaultOptions['choices_as_values'] = true;

diff --git a/Tests/Form/Type/BooleanTypeTest.php b/Tests/Form/Type/BooleanTypeTest.php
@@ -163,6 +163,7 @@ public function testOptions()
         $expectedOptions = array(
             'transform' => false,
             'catalogue' => 'SonataCoreBundle',
+            'choice_translation_domain' => 'SonataCoreBundle',
             'choices_as_values' => true,
             'translation_domain' => 'fooTrans',
             'choices' => array(1 => 'foo_yes', 2 => 'foo_no'),
@@ -173,6 +174,11 @@ public function testOptions()
             unset($expectedOptions['choices_as_values']);
         }
 
+        // NEXT_MAJOR: Remove this block (when requirement of Symfony is >= 2.7)
+        if (!method_exists('Symfony\Component\Form\AbstractType', 'configureOptions')) {
+            unset($expectedOptions['choice_translation_domain']);
+        }
+
         $this->assertSame($expectedOptions, $resolvedOptions);
     }