#364 Make the bundle configutation compatible with using ENV variables, fix test incompatibility with Symfony 7.x (#365)

Author: kick-the-bucket

DependencyInjection/BazingaJsTranslationExtension.php

@@ -32,11 +32,6 @@ public function load(array $configs, ContainerBuilder $container): void
             ->replaceArgument(6, $config['default_domain'])
             ->replaceArgument(7, $config['http_cache_time']);
 
-        // Add fallback locale to active locales if missing
-        if ($config['active_locales'] && !in_array($config['locale_fallback'], $config['active_locales'])) {
-            array_push($config['active_locales'], $config['locale_fallback']);
-        }
-
         $container
             ->getDefinition('bazinga.jstranslation.translation_dumper')
             ->replaceArgument(3, $config['locale_fallback'])

Dumper/TranslationDumper.php

@@ -79,6 +79,10 @@ public function __construct(
         $this->filesystem     = $filesystem;
         $this->localeFallback = $localeFallback;
         $this->defaultDomain  = $defaultDomain;
+        // Add fallback locale to active locales if missing
+        if ($activeLocales && !in_array($localeFallback, $activeLocales)) {
+            array_push($activeLocales, $localeFallback);
+        }
         $this->activeLocales  = $activeLocales;
         $this->activeDomains  = $activeDomains;
     }

Tests/Fixtures/app/config/base_config.yml

@@ -15,7 +15,7 @@ twig:
 bazinga_js_translation:
     active_locales:
         - fr
-        - en
+    locale_fallback: en
     active_domains:
         - messages
         - numerics