Add choice_translation_domain handling

+ Fix test

Author: artursvonda

Tests/Translation/Extractor/File/Fixture/MyFormType.php

@@ -76,6 +76,14 @@ public function buildForm(FormBuilder $builder, array $options)
                 'choices' => array('foo' => 'bar'),
                 'choice_translation_domain' => 'choice-domain'
             ))
+            ->add('choices_without_translation', 'choice', array(
+                'choices' => array('foo' => 'bar'),
+                'choice_translation_domain' => false,
+            ))
+            ->add('untranslatable_label', 'text', array(
+                'label' => 'bar',
+                'translation_domain' => false,
+            ))
         ;
     }
 }

Tests/Translation/Extractor/FileExtractorTest.php

@@ -23,11 +23,9 @@
 use JMS\TranslationBundle\Translation\Extractor\File\FormExtractor;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
-use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
 use JMS\TranslationBundle\Translation\Extractor\File\ValidationExtractor;
 use JMS\TranslationBundle\Model\FileSource;
 use JMS\TranslationBundle\Model\Message;
-use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor;
 use JMS\TranslationBundle\Translation\Extractor\File\TranslationContainerExtractor;
 use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor;
@@ -77,7 +75,7 @@ public function testExtractWithSimpleTestFixtures()
             $expected[$engine.'.foo_bar'] = $message;
         }
 
-        $actual = $this->extract(__DIR__.'/Fixture/SimpleTest/')->getDomain('messages')->all();
+        $actual = $this->extract(__DIR__.'/Fixture/SimpleTest')->getDomain('messages')->all();
 
         asort($expected);
         asort($actual);

Translation/Extractor/File/FormExtractor.php

@@ -70,17 +70,30 @@ public function enterNode(\PHPParser_Node $node)
         if ($node instanceof \PHPParser_Node_Expr_Array) {
             // first check if a translation_domain is set for this field
             $domain = null;
+            $choiceDomain = null;
             foreach ($node->items as $item) {
                 if (!$item->key instanceof \PHPParser_Node_Scalar_String) {
                     continue;
                 }
 
                 if ('translation_domain' === $item->key->value) {
-                    if (!$item->value instanceof \PHPParser_Node_Scalar_String) {
-                        continue;
+                    if ($item->value instanceof \PHPParser_Node_Scalar_String) {
+                        $domain = $item->value->value;
+                    } elseif ($item->value instanceof \PHPParser_Node_Expr_ConstFetch) {
+                        $constant = (string) $item->value->name;
+                        if ($constant === 'false') {
+                            $domain = false;
+                        }
+                    }
+                } elseif ('choice_translation_domain' === $item->key->value) {
+                    if ($item->value instanceof \PHPParser_Node_Scalar_String) {
+                        $choiceDomain = $item->value->value;
+                    } elseif ($item->value instanceof \PHPParser_Node_Expr_ConstFetch) {
+                        $constant = (string) $item->value->name;
+                        if ($constant === 'false') {
+                            $choiceDomain = false;
+                        }
                     }
-
-                    $domain = $item->value->value;
                 }
             }
 
@@ -118,7 +131,7 @@ public function enterNode(\PHPParser_Node $node)
 
                 if ('choices' === $item->key->value) {
                     foreach ($item->value->items as $sitem) {
-                        $this->parseItem($sitem, $domain);
+                        $this->parseItem($sitem, $choiceDomain !== null ? $choiceDomain : $domain);
                     }
                 } elseif ('attr' === $item->key->value && is_array($item->value->items)) {
                     foreach ($item->value->items as $sitem) {
@@ -255,6 +268,11 @@ private function parseItem($item, $domain = null)
             throw new RuntimeException($message);
         }
 
+        if ($domain === false) {
+            // Don't translate when domain is `false`
+            return;
+        }
+
         $source = new FileSource((string) $this->file, $item->value->getLine());
         $id = $item->value->value;