Fix constant domain resolution

VincentLanglet · VincentLanglet · commit a357f58f3baf · 2024-01-24T09:56:59.000+01:00
diff --git a/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php
@@ -46,13 +46,20 @@ public function extract(iterable|string $resource, MessageCatalogue $catalogue):
     {
         foreach ($this->extractFiles($resource) as $file) {
             $traverser = new NodeTraverser();
+
+            $nodes = $this->parser->parse(file_get_contents($file));
+
+            // First run is needed to resolve namespaces in class methods/constants.
+            $traverser->addVisitor(new NodeVisitor\NameResolver());
+            $traverser->traverse($nodes);
+
             /** @var AbstractVisitor&NodeVisitor $visitor */
             foreach ($this->visitors as $visitor) {
                 $visitor->initialize($catalogue, $file, $this->prefix);
                 $traverser->addVisitor($visitor);
             }
 
-            $nodes = $this->parser->parse(file_get_contents($file));
+            // Second run is used for the custom visitors.
             $traverser->traverse($nodes);
         }
     }
diff --git a/src/Symfony/Component/Translation/Extractor/Visitor/AbstractVisitor.php b/src/Symfony/Component/Translation/Extractor/Visitor/AbstractVisitor.php
@@ -119,6 +119,17 @@ private function getStringValue(Node $node): ?string
             return $node->expr->value;
         }
 
+        if ($node instanceof Node\Expr\ClassConstFetch) {
+            try {
+                $reflection = new \ReflectionClass($node->class->toString());
+                $constant = $reflection->getReflectionConstant($node->name->toString());
+                if (false !== $constant && \is_string($constant->getValue())) {
+                    return $constant->getValue();
+                }
+            } catch (\ReflectionException) {
+            }
+        }
+
         return null;
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/Extractor/PhpAstExtractorTest.php b/src/Symfony/Component/Translation/Tests/Extractor/PhpAstExtractorTest.php
@@ -20,6 +20,8 @@
 
 final class PhpAstExtractorTest extends TestCase
 {
+    public const OTHER_DOMAIN = 'not_messages';
+
     /**
      * @dataProvider resourcesProvider
      */
@@ -124,6 +126,7 @@ public function testExtraction(iterable|string $resource)
                 'variable-assignation-inlined-with-named-arguments-in-trans-method' => 'prefixvariable-assignation-inlined-with-named-arguments-in-trans-method',
                 'mix-named-arguments-without-parameters' => 'prefixmix-named-arguments-without-parameters',
                 'mix-named-arguments-disordered' => 'prefixmix-named-arguments-disordered',
+                'const-domain' => 'prefixconst-domain',
             ],
             'validators' => [
                 'message-in-constraint-attribute' => 'prefixmessage-in-constraint-attribute',
diff --git a/src/Symfony/Component/Translation/Tests/Fixtures/extractor-ast/translation.html.php b/src/Symfony/Component/Translation/Tests/Fixtures/extractor-ast/translation.html.php
@@ -62,3 +62,8 @@
 <?php echo $view['translator']->trans('mix-named-arguments-disordered', domain: 'not_messages', parameters: []); ?>
 
 <?php echo $view['translator']->trans(...); // should not fail ?>
+
+<?php
+use Symfony\Component\Translation\Tests\Extractor\PhpAstExtractorTest;
+echo $view['translator']->trans('const-domain', [], PhpAstExtractorTest::OTHER_DOMAIN);
+?>

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,20 @@ public function extract(iterable\|string $resource, MessageCatalogue $catalogue):`
`46`	`46`	`{`
`47`	`47`	`foreach ($this->extractFiles($resource) as $file) {`
`48`	`48`	`$traverser = new NodeTraverser();`
	`49`	`+`
	`50`	`+ $nodes = $this->parser->parse(file_get_contents($file));`
	`51`	`+`
	`52`	`+ // First run is needed to resolve namespaces in class methods/constants.`
	`53`	`+ $traverser->addVisitor(new NodeVisitor\NameResolver());`
	`54`	`+ $traverser->traverse($nodes);`
	`55`	`+`
`49`	`56`	`/** @var AbstractVisitor&NodeVisitor $visitor */`
`50`	`57`	`foreach ($this->visitors as $visitor) {`
`51`	`58`	`$visitor->initialize($catalogue, $file, $this->prefix);`
`52`	`59`	`$traverser->addVisitor($visitor);`
`53`	`60`	`}`
`54`	`61`
`55`		`- $nodes = $this->parser->parse(file_get_contents($file));`
	`62`	`+ // Second run is used for the custom visitors.`
`56`	`63`	`$traverser->traverse($nodes);`
`57`	`64`	`}`
`58`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,17 @@ private function getStringValue(Node $node): ?string`
`119`	`119`	`return $node->expr->value;`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ if ($node instanceof Node\Expr\ClassConstFetch) {`
	`123`	`+ try {`
	`124`	`+ $reflection = new \ReflectionClass($node->class->toString());`
	`125`	`+ $constant = $reflection->getReflectionConstant($node->name->toString());`
	`126`	`+ if (false !== $constant && \is_string($constant->getValue())) {`
	`127`	`+ return $constant->getValue();`
	`128`	`+ }`
	`129`	`+ } catch (\ReflectionException) {`
	`130`	`+ }`
	`131`	`+ }`
	`132`	`+`
`122`	`133`	`return null;`
`123`	`134`	`}`
`124`	`135`	`}`