Merge branch '3.0'

Tobion · Tobion · commit 5d4b7af8de44 · 2016-03-25T02:52:00.000+01:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -721,9 +721,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
`@@ -721,9 +721,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`721`	`721`	`->in($dirs)`
`722`	`722`	`;`
`723`	`723`
`724`		`- $locales = array();`
`725`	`724`	`foreach ($finder as $file) {`
`726`		`- list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);`
	`725`	`+ list(, $locale) = explode('.', $file->getBasename(), 3);`
`727`	`726`	`if (!isset($files[$locale])) {`
`728`	`727`	`$files[$locale] = array();`
`729`	`728`	`}`