[FrameworkBundle] fix merging of enabled locales

Author: dmaicher

DependencyInjection/FrameworkExtension.php

@@ -1622,11 +1622,11 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
         foreach ($config['providers'] as $provider) {
             if ($provider['locales']) {
-                $locales += $provider['locales'];
+                $locales = array_merge($locales, $provider['locales']);
             }
         }
 
-        $locales = array_unique($locales);
+        $locales = array_values(array_unique($locales));
 
         $container->getDefinition('console.command.translation_pull')
             ->replaceArgument(4, array_merge($transPaths, [$config['default_path']]))

Tests/DependencyInjection/Fixtures/php/translator_providers.php

@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'enabled_locales' => ['es'],
+    'translator' => [
+        'providers' => [
+            'foo_provider' => [
+                'locales' => ['en', 'fr'],
+            ],
+            'bar_provider' => [
+                'locales' => ['de', 'pl'],
+            ]
+        ]
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/translator_providers.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config secret="s3cr3t" http-method-override="false" handle-all-throwables="true">
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:enabled-locale>es</framework:enabled-locale>
+        <framework:translator enabled="true">
+            <framework:provider name="foo_provider">
+                <framework:locale>en</framework:locale>
+                <framework:locale>fr</framework:locale>
+            </framework:provider>
+            <framework:provider name="bar_provider">
+                <framework:locale>de</framework:locale>
+                <framework:locale>pl</framework:locale>
+            </framework:provider>
+        </framework:translator>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/translator_providers.yml

@@ -0,0 +1,13 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    enabled_locales: [ 'es' ]
+    php_errors:
+        log: true
+    translator:
+        providers:
+            foo_provider:
+                locales: [ 'en', 'fr' ]
+            bar_provider:
+                locales: [ 'de', 'pl' ]

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -1262,6 +1262,13 @@ public function testTranslator()
         $this->assertSame('Fixtures/translations', $options['cache_vary']['scanned_directories'][3]);
     }
 
+    public function testTranslatorProvidersMergedEnabledLocales()
+    {
+        $container = $this->createContainerFromFile('translator_providers');
+        self::assertSame(['es', 'en', 'fr', 'de', 'pl'], $container->getDefinition('console.command.translation_pull')->getArgument(5));
+        self::assertSame(['es', 'en', 'fr', 'de', 'pl'], $container->getDefinition('console.command.translation_push')->getArgument(3));
+    }
+
     public function testTranslatorMultipleFallbacks()
     {
         $container = $this->createContainerFromFile('translator_fallbacks');