Merge 298f6f8 into 40de0eb

Kunstmaan · May 10, 2018 · b6efce2 · b6efce2
2 parents 40de0eb + 298f6f8
commit b6efce2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...nstmaan/TranslatorBundle/DependencyInjection/Compiler/KunstmaanTranslatorCompilerPass.php b/...nstmaan/TranslatorBundle/DependencyInjection/Compiler/KunstmaanTranslatorCompilerPass.php
@@ -30,7 +30,7 @@ public function process(ContainerBuilder $container)
         }
 
         if ($container->hasDefinition('kunstmaan_translator.service.translator.translator')) {
-            $container->getDefinition('kunstmaan_translator.service.translator.translator')->replaceArgument(2, $loaderAliases);
+            $container->getDefinition('kunstmaan_translator.service.translator.translator')->replaceArgument(3, $loaderAliases);
         }
 
         // add all exporter into the translation exporter

diff --git a/src/Kunstmaan/TranslatorBundle/Resources/config/services.yml b/src/Kunstmaan/TranslatorBundle/Resources/config/services.yml
@@ -82,10 +82,10 @@ services:
         class: Kunstmaan\TranslatorBundle\Service\Translator\Translator
         arguments:
             - '@service_container'
-            - '@translator.selector'
+            - '@translator.formatter'
+            - '%kernel.default_locale%'
             - {}
             - { cache_dir: '%kuma_translator.cache_dir%', debug: '%kuma_translator.debug%' }
-            - ['@session']
         calls:
             - [setTranslationRepository, ['@kunstmaan_translator.repository.translation']]
             - [setResourceCacher, ['@kunstmaan_translator.service.translator.resource_cacher']]

diff --git a/...anslatorBundle/Tests/DependencyInjection/Compiler/KunstmaanTranslatorCompilerPassTest.php b/...anslatorBundle/Tests/DependencyInjection/Compiler/KunstmaanTranslatorCompilerPassTest.php
@@ -24,7 +24,7 @@ public function testContainerKeys()
         $this->setDefinition($svcId, $svc);
 
         $this->setDefinition('kunstmaan_translator.service.translator.translator', new Definition(null, [
-            'alias', 'legacy-alias', 'replaceMe'
+            'container', 'formatter', 'default_locale', 'replaceMe', 'options'
         ]));
 
         $this->setDefinition('kunstmaan_translator.service.exporter.exporter', new Definition());
@@ -43,4 +43,4 @@ public function testContainerKeys()
             [['someAlias' => new Reference($svcId)]]
         );
     }
-}
+}
diff --git a/src/Kunstmaan/TranslatorBundle/Tests/app/config/config.yml b/src/Kunstmaan/TranslatorBundle/Tests/app/config/config.yml
@@ -15,6 +15,7 @@ framework:
     default_locale:  nl
     session:         ~
     fragments:       ~
+    translator: { fallback: "en" }
 
 services:
     translation.loader.yml: