From ca5a5af714512889421bdb077f7c8e9fd801b164 Mon Sep 17 00:00:00 2001
From: Jelmer Prins <github@carakas.be>
Date: Sat, 3 Jul 2021 00:37:33 +0200
Subject: [PATCH] Prevent translation files overwriting files from addResource
 calls

---
 DependencyInjection/Compiler/TranslationResourceFilesPass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DependencyInjection/Compiler/TranslationResourceFilesPass.php b/DependencyInjection/Compiler/TranslationResourceFilesPass.php
index 17ddc4d4..c9b86b23 100644
--- 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);
     }