Fix #17306 Paths with % in it are note allowed (like urlencoded)

Pavel Batanov · Pavel Batanov · commit de7b4d73c61f · 2016-01-09T15:55:11.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -562,17 +562,17 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 $dirs[] = dirname($r->getFileName()).'/../../Resources/translations';
             }
         }
-        $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
+        $rootDir = $container->getParameter('kernel.root_dir');
         foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
             $reflection = new \ReflectionClass($class);
             if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
                 $dirs[] = $dir;
             }
-            if (is_dir($dir = sprintf($overridePath, $bundle))) {
+            if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) {
                 $dirs[] = $dir;
             }
         }
-        if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {
+        if (is_dir($dir = $rootDir.'/Resources/translations')) {
             $dirs[] = $dir;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -562,17 +562,17 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`562`	`562`	`$dirs[] = dirname($r->getFileName()).'/../../Resources/translations';`
`563`	`563`	`}`
`564`	`564`	`}`
`565`		`- $overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';`
	`565`	`+ $rootDir = $container->getParameter('kernel.root_dir');`
`566`	`566`	`foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {`
`567`	`567`	`$reflection = new \ReflectionClass($class);`
`568`	`568`	`if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {`
`569`	`569`	`$dirs[] = $dir;`
`570`	`570`	`}`
`571`		`- if (is_dir($dir = sprintf($overridePath, $bundle))) {`
	`571`	`+ if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) {`
`572`	`572`	`$dirs[] = $dir;`
`573`	`573`	`}`
`574`	`574`	`}`
`575`		`- if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/translations')) {`
	`575`	`+ if (is_dir($dir = $rootDir.'/Resources/translations')) {`
`576`	`576`	`$dirs[] = $dir;`
`577`	`577`	`}`
`578`	`578`