[TwigBridge] fixed node visitors priority & added extractor tests

jfsimon · jfsimon · commit 2f3d0e006191 · 2013-02-27T17:36:18.000+01:00
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -76,6 +76,6 @@ public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
      */
     public function getPriority()
     {
-        return 0;
+        return -10;
     }
 }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -93,6 +93,6 @@ public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
      */
     public function getPriority()
     {
-        return -10;
+        return 0;
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -68,6 +68,8 @@ public function getExtractData()
             array('{% set foo = "new key" | trans %}', array('new key' => 'messages')),
             array('{{ 1 ? "new key" | trans : "another key" | trans }}', array('new key' => 'messages', 'another key' => 'messages')),
             array('{% trans_default_domain "domain" %}{{ "new key"|trans }}', array('new key' => 'domain')),
+            array('{% trans_default_domain "domain" %}{{ "new key"|transchoice }}', array('new key' => 'domain')),
+            array('{% trans_default_domain "domain" %}{% trans %}new key{% endtrans %}', array('new key' => 'domain')),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)`
`76`	`76`	`*/`
`77`	`77`	`public function getPriority()`
`78`	`78`	`{`
`79`		`- return 0;`
	`79`	`+ return -10;`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,6 @@ public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)`
`93`	`93`	`*/`
`94`	`94`	`public function getPriority()`
`95`	`95`	`{`
`96`		`- return -10;`
	`96`	`+ return 0;`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ public function getExtractData()`
`68`	`68`	`array('{% set foo = "new key" \| trans %}', array('new key' => 'messages')),`
`69`	`69`	`array('{{ 1 ? "new key" \| trans : "another key" \| trans }}', array('new key' => 'messages', 'another key' => 'messages')),`
`70`	`70`	`array('{% trans_default_domain "domain" %}{{ "new key"\|trans }}', array('new key' => 'domain')),`
	`71`	`+ array('{% trans_default_domain "domain" %}{{ "new key"\|transchoice }}', array('new key' => 'domain')),`
	`72`	`+ array('{% trans_default_domain "domain" %}{% trans %}new key{% endtrans %}', array('new key' => 'domain')),`
`71`	`73`	`);`
`72`	`74`	`}`
`73`	`75`	`}`