Merge branch '6.3' into 6.4

* 6.3:
  [AssetMapper] Handle assets with non-ascii characters in dev server
  [Translation] Fix `TranslationNodeVisitor` with constant domain
  [Messenger] [AMQP] Throw exception on `nack` callback
  [Validator] revise Latvian translations
  [ErrorHandler] Fix `RecursiveDirectoryIterator` exception with wrong composer autoload
  [HttpFoundation] Request without content-type or content-length header should result in null values, not empty strings
  [Cache] Fix possible infinite loop in `CachePoolPass`
  grab a service from the container only if it exists
  [Mime] Fix undefined array key 0 when empty sender
  [Console] Allow '0' as a $shortcut in InputOption.php
  fix multi-byte code area to convert
  [Validator] Make it explicit when English translation differs from its resource name

Author: nicolas-grekas

NodeVisitor/TranslationNodeVisitor.php

@@ -149,6 +149,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;
     }
 

Tests/Translation/TwigExtractorTest.php

@@ -22,6 +22,8 @@
 
 class TwigExtractorTest extends TestCase
 {
+    public const CUSTOM_DOMAIN = 'domain';
+
     /**
      * @dataProvider getExtractData
      */
@@ -76,6 +78,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']],