[FrameworkBundle] Allow dots in translation domains

jschaedl · jschaedl · commit 1693d9915633 · 2019-06-01T11:11:45.000+02:00
diff --git a/phpunit b/phpunit
@@ -8,7 +8,7 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     exit(1);
 }
 if (\PHP_VERSION_ID >= 70000 && !getenv('SYMFONY_PHPUNIT_VERSION')) {
-    putenv('SYMFONY_PHPUNIT_VERSION=6.5');
+    putenv('SYMFONY_PHPUNIT_VERSION=6.5.11');
 }
 putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
 require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1153,14 +1153,15 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 ->followLinks()
                 ->files()
                 ->filter(function (\SplFileInfo $file) {
-                    return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
+                    return 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
                 })
                 ->in($dirs)
                 ->sortByName()
             ;
 
             foreach ($finder as $file) {
-                list(, $locale) = explode('.', $file->getBasename(), 3);
+                $fileNameParts = explode('.', basename($file));
+                $locale = $fileNameParts[\count($fileNameParts) - 2];
                 if (!isset($files[$locale])) {
                     $files[$locale] = [];
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/translations/domain.with.dots.en.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/translations/domain.with.dots.en.yml
@@ -0,0 +1,3 @@
+domain:
+    with:
+        dots: It works!
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -816,6 +816,11 @@ public function testTranslator()
             $files,
             '->registerTranslatorConfiguration() finds translation resources in default path'
         );
+        $this->assertContains(
+            strtr(__DIR__.'/Fixtures/translations/domain.with.dots.en.yml', '/', \DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds translation resources with dots in domain'
+        );
 
         $calls = $container->getDefinition('translator.default')->getMethodCalls();
         $this->assertEquals(['fr'], $calls[1][1][0]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/translations/domain.with.dots.en.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/translations/domain.with.dots.en.yml
@@ -0,0 +1 @@
+message: It works!
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -373,6 +373,21 @@ public function testWarmup()
         $this->assertEquals('répertoire', $translator->trans('folder'));
     }
 
+    public function testLoadingTranslationFilesWithDotsInMessageDomain()
+    {
+        $loader = new \Symfony\Component\Translation\Loader\YamlFileLoader();
+        $resourceFiles = [
+            'en' => [
+                __DIR__.'/../Fixtures/Resources/translations/domain.with.dots.en.yml',
+            ],
+        ];
+
+        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir, 'resource_files' => $resourceFiles], 'yml');
+        $translator->setLocale('en');
+        $translator->setFallbackLocales(['fr']);
+        $this->assertEquals('It works!', $translator->trans('message', [], 'domain.with.dots'));
+    }
+
     private function createTranslator($loader, $options, $translatorClass = '\Symfony\Bundle\FrameworkBundle\Translation\Translator', $loaderFomat = 'loader', $defaultLocale = 'en')
     {
         if (null === $defaultLocale) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -165,7 +165,10 @@ private function addResourceFiles()
         foreach ($filesByLocale as $locale => $files) {
             foreach ($files as $key => $file) {
                 // filename is domain.locale.format
-                list($domain, $locale, $format) = explode('.', basename($file), 3);
+                $fileNameParts = explode('.', basename($file));
+                $format = array_pop($fileNameParts);
+                $locale = array_pop($fileNameParts);
+                $domain = implode('.', $fileNameParts);
                 $this->addResource($format, $file, $locale, $domain);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {`
`8`	`8`	`exit(1);`
`9`	`9`	`}`
`10`	`10`	`if (\PHP_VERSION_ID >= 70000 && !getenv('SYMFONY_PHPUNIT_VERSION')) {`
`11`		`- putenv('SYMFONY_PHPUNIT_VERSION=6.5');`
	`11`	`+ putenv('SYMFONY_PHPUNIT_VERSION=6.5.11');`
`12`	`12`	`}`
`13`	`13`	`putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');`
`14`	`14`	`require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+domain:`
	`2`	`+ with:`
	`3`	`+ dots: It works!`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,10 @@ private function addResourceFiles()`
`165`	`165`	`foreach ($filesByLocale as $locale => $files) {`
`166`	`166`	`foreach ($files as $key => $file) {`
`167`	`167`	`// filename is domain.locale.format`
`168`		`- list($domain, $locale, $format) = explode('.', basename($file), 3);`
	`168`	`+ $fileNameParts = explode('.', basename($file));`
	`169`	`+ $format = array_pop($fileNameParts);`
	`170`	`+ $locale = array_pop($fileNameParts);`
	`171`	`+ $domain = implode('.', $fileNameParts);`
`169`	`172`	`$this->addResource($format, $file, $locale, $domain);`
`170`	`173`	`}`
`171`	`174`	`}`