bug #53357 [Translation] Fix TranslationNodeVisitor with constant domain (VincentLanglet)

nicolas-grekas · nicolas-grekas · commit c32e249abc32 · 2024-01-23T14:16:11.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Translation] Fix `TranslationNodeVisitor` with constant domain | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | Fix #...  | License | MIT Related to #53356 but fixing only the twig part. Commits ------- d14795d [Translation] Fix `TranslationNodeVisitor` with constant domain
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -158,6 +158,22 @@ private function getReadDomainFromNode(Node $node): ?string
             return $node->getAttribute('value');
         }
 
+        if (
+            $node instanceof FunctionExpression
+            && 'constant' === $node->getAttribute('name')
+        ) {
+            $nodeArguments = $node->getNode('arguments');
+            if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) {
+                $constantName = $nodeArguments->getIterator()->current()->getAttribute('value');
+                if (\defined($constantName)) {
+                    $value = \constant($constantName);
+                    if (\is_string($value)) {
+                        return $value;
+                    }
+                }
+            }
+        }
+
         return self::UNDEFINED_DOMAIN;
     }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -22,6 +22,8 @@
 
 class TwigExtractorTest extends TestCase
 {
+    public const CUSTOM_DOMAIN = 'domain';
+
     /**
      * @dataProvider getExtractData
      */
@@ -77,6 +79,11 @@ public static function getExtractData()
             // make sure this works with twig's named arguments
             ['{{ "new key" | trans(domain="domain") }}', ['new key' => 'domain']],
 
+            // make sure this works with const domain
+            ['{{ "new key" | trans({}, constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\')) }}', ['new key' => self::CUSTOM_DOMAIN]],
+            ['{% trans from constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\') %}new key{% endtrans %}', ['new key' => self::CUSTOM_DOMAIN]],
+            ['{{ t("new key", {}, constant(\'Symfony\\\\Bridge\\\\Twig\\\\Tests\\\\Translation\\\\TwigExtractorTest::CUSTOM_DOMAIN\')) | trans() }}', ['new key' => self::CUSTOM_DOMAIN]],
+
             // concat translations
             ['{{ ("new" ~ " key") | trans() }}', ['new key' => 'messages']],
             ['{{ ("another " ~ "new " ~ "key") | trans() }}', ['another new key' => 'messages']],
