Prevent translation files overwriting files from addResource calls (#320)

carakas · web-flow · commit 279a67fe987d · 2021-07-05T10:35:48.000+01:00
diff --git a/DependencyInjection/Compiler/TranslationResourceFilesPass.php b/DependencyInjection/Compiler/TranslationResourceFilesPass.php
@@ -18,7 +18,7 @@ public function process(ContainerBuilder $container)
         }
 
         $translationFiles = $this->getTranslationFilesFromAddResourceCalls($container);
-        $translationFiles = array_merge($translationFiles, $this->getTranslationFiles($container));
+        $translationFiles = array_merge_recursive($translationFiles, $this->getTranslationFiles($container));
 
         $container->getDefinition('bazinga.jstranslation.translation_finder')->replaceArgument(0, $translationFiles);
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function process(ContainerBuilder $container)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`$translationFiles = $this->getTranslationFilesFromAddResourceCalls($container);`
`21`		`- $translationFiles = array_merge($translationFiles, $this->getTranslationFiles($container));`
	`21`	`+ $translationFiles = array_merge_recursive($translationFiles, $this->getTranslationFiles($container));`
`22`	`22`
`23`	`23`	`$container->getDefinition('bazinga.jstranslation.translation_finder')->replaceArgument(0, $translationFiles);`
`24`	`24`	`}`