Merge branch '2.7' into 2.8

Tobion · Tobion · commit 759d97744d97 · 2016-03-25T02:40:30.000+01:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -734,9 +734,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
`@@ -734,9 +734,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`734`	`734`	`->in($dirs)`
`735`	`735`	`;`
`736`	`736`
`737`		`- $locales = array();`
`738`	`737`	`foreach ($finder as $file) {`
`739`		`- list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);`
	`738`	`+ list(, $locale) = explode('.', $file->getBasename(), 3);`
`740`	`739`	`if (!isset($files[$locale])) {`
`741`	`740`	`$files[$locale] = array();`
`742`	`741`	`}`