Injected the value instead of defining a parameter

javiereguiluz · javiereguiluz · commit 3a63bb23a9d5 · 2019-12-04T08:39:27.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -677,9 +677,9 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()
-                        ->variableNode('enabled_locales')
+                        ->arrayNode('enabled_locales')
+                            ->prototype('scalar')
                             ->defaultValue([])
-                            ->treatNullLike([])
                             ->beforeNormalization()
                                 ->always()
                                 ->then(function ($config) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1039,6 +1039,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $defaultOptions['cache_dir'] = $config['cache_dir'];
         $translator->setArgument(4, $defaultOptions);
 
+        $translator->setArgument(6, $config['enabled_locales']);
+
         $container->setParameter('translator.logging', $config['logging']);
         $container->setParameter('translator.default_path', $config['default_path']);
 
@@ -1132,9 +1134,6 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             $translator->replaceArgument(4, $options);
         }
-
-        // Register the enabled locales
-        $container->setParameter('translation.enabled_locales', $config['enabled_locales']);
     }
 
     private function registerValidationConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader, bool $propertyInfoEnabled)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -16,7 +16,7 @@
                 <argument key="cache_dir">%kernel.cache_dir%/translations</argument>
                 <argument key="debug">%kernel.debug%</argument>
             </argument>
-            <argument>%translation.enabled_locales%</argument>
+            <argument /> <!-- enabled locales -->
             <call method="setConfigCacheFactory">
                 <argument type="service" id="config_cache_factory" />
             </call>

Original file line number	Diff line number	Diff line change
`@@ -1039,6 +1039,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1039`	`1039`	`$defaultOptions['cache_dir'] = $config['cache_dir'];`
`1040`	`1040`	`$translator->setArgument(4, $defaultOptions);`
`1041`	`1041`
	`1042`	`+ $translator->setArgument(6, $config['enabled_locales']);`
	`1043`	`+`
`1042`	`1044`	`$container->setParameter('translator.logging', $config['logging']);`
`1043`	`1045`	`$container->setParameter('translator.default_path', $config['default_path']);`
`1044`	`1046`
`@@ -1132,9 +1134,6 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1132`	`1134`
`1133`	`1135`	`$translator->replaceArgument(4, $options);`
`1134`	`1136`	`}`
`1135`		`-`
`1136`		`- // Register the enabled locales`
`1137`		`- $container->setParameter('translation.enabled_locales', $config['enabled_locales']);`
`1138`	`1137`	`}`
`1139`	`1138`
`1140`	`1139`	`private function registerValidationConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader, bool $propertyInfoEnabled)`