Handle placeholder attribute better

Author: artursvonda

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

@@ -93,5 +93,16 @@ public function buildForm(FormBuilder $builder, array $options)
                 'translation_domain' => false,
             ))
         ;
+
+        $builder->add('untranslateable_field_with_placeholder', 'text', array(
+            'label' => 'field.with.placeholder.no.translation.domain',
+            'attr' => array('placeholder' => /** @Desc("Field with a placeholder value") */ 'form.placeholder.text.skip'),
+            'translation_domain' => false,
+        ));
+
+        $builder->add('custom_domain_field_with_placeholder', 'text', array(
+            'attr' => array('placeholder' => 'form.custom_domain_field_with_placeholder.attr.placeholder'),
+            'translation_domain' => 'custom_domain_field_with_placeholder',
+        ));
     }
 }

Tests/Translation/Extractor/File/FormExtractorTest.php

@@ -160,6 +160,10 @@ public function testExtract()
         $message->addSource($fileSourceFactory->create($fixtureSplInfo, 84));
         $expected->add($message);
 
+        $message = new Message('form.custom_domain_field_with_placeholder.attr.placeholder', 'custom_domain_field_with_placeholder');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 104));
+        $expected->add($message);
+
         $this->assertEquals($expected, $this->extract('MyFormType.php'));
     }
 

Translation/Extractor/File/FormExtractor.php

@@ -77,6 +77,11 @@ class FormExtractor implements FileVisitorInterface, LoggerAwareInterface, NodeV
      */
     private $defaultDomainMessages;
 
+    /**
+     * @var Node
+     */
+    private $attrNode;
+
     /**
      * FormExtractor constructor.
      * @param DocParser $docParser
@@ -115,6 +120,10 @@ public function enterNode(Node $node)
         }
 
         if ($node instanceof Node\Expr\Array_) {
+            if ($node === $this->attrNode) {
+                // Skip attr node since we already parsed that.
+                return;
+            }
             // first check if a translation_domain is set for this field
             $domain = $this->getDomain($node);
             $choiceDomain = $this->getChoiceDomain($node);
@@ -149,6 +158,9 @@ public function enterNode(Node $node)
                         $this->parseItem($item, $domain);
                         break;
                     case 'attr':
+                        if (isset($item->value)) {
+                            $this->attrNode = $item->value;
+                        }
                         if ($this->parseAttrNode($item, $domain)) {
                             continue 2;
                         }