Merge branch '2.8' into 3.0

Tobion · Tobion · commit bd7b44953bf4 · 2016-03-25T02:41:20.000+01:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -709,9 +709,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 ->in($dirs)
             ;
 
-            $locales = array();
             foreach ($finder as $file) {
-                list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+                list(, $locale) = explode('.', $file->getBasename(), 3);
                 if (!isset($files[$locale])) {
                     $files[$locale] = array();
                 }

Original file line number	Diff line number	Diff line change
`@@ -709,9 +709,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`709`	`709`	`->in($dirs)`
`710`	`710`	`;`
`711`	`711`
`712`		`- $locales = array();`
`713`	`712`	`foreach ($finder as $file) {`
`714`		`- list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);`
	`713`	`+ list(, $locale) = explode('.', $file->getBasename(), 3);`
`715`	`714`	`if (!isset($files[$locale])) {`
`716`	`715`	`$files[$locale] = array();`
`717`	`716`	`}`