From a6d39db5d887d1bae3ef1bba583539bd3707da79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Mon, 12 Feb 2024 11:07:43 +0100
Subject: [PATCH] Apply fix on TranslationServiceProvider d'Alexis

---
 app/Providers/TranslationServiceProvider.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Providers/TranslationServiceProvider.php b/app/Providers/TranslationServiceProvider.php
index 9b3029f..d23c470 100644
--- a/app/Providers/TranslationServiceProvider.php
+++ b/app/Providers/TranslationServiceProvider.php
@@ -3,7 +3,6 @@
 namespace App\Providers;
 
 use App\Lib\Helpers\ToolboxHelper;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\ServiceProvider;
@@ -19,33 +18,33 @@ class TranslationServiceProvider extends ServiceProvider
     public function boot(): void
     {
         foreach ($this->collectLocalesStrings() as $locale) {
-            // * Suported locales
+            // * Suported locales.
             Cache::rememberForever(sprintf('translations.%s', $locale), function () use ($locale) {
                 $phpTransFallback  = $this->phpTranslations(config('app.fallback_locale'));
                 $phpTransLocale    = $this->phpTranslations($locale);
                 $jsonTransFallback = $this->jsonTranslations(config('app.fallback_locale'));
                 $jsonTransLocale   = $this->jsonTranslations($locale);
                 $translations      = [
-                    'php' => ToolboxHelper::arrayMergeRecursiveDistinct(
-                        $phpTransLocale,
+                    'php'  => ToolboxHelper::arrayMergeRecursiveDistinct(
                         $phpTransFallback,
+                        $phpTransLocale,
                     ),
                     'json' => ToolboxHelper::arrayMergeRecursiveDistinct(
-                        $jsonTransLocale,
                         $jsonTransFallback,
+                        $jsonTransLocale,
                     ),
                 ];
                 return $translations;
             });
-        }
+        } //end foreach
     }
 
     /**
-     * Gather provided langs checking from files
+     * Gather provided langs checking from files.
      *
      * @return \Illuminate\Support\Collection<string, string>
      */
-    private function collectLocalesStrings(): Collection
+    private function collectLocalesStrings(): \Illuminate\Support\Collection
     {
         // * En dur dans ->keys array<int,string>.
         // @phpstan-ignore-next-line
@@ -57,7 +56,7 @@ class TranslationServiceProvider extends ServiceProvider
     }
 
     /**
-     * Gather all php translations
+     * Gather all php translations.
      *
      * @param string $locale
      * @return array<string, string>
@@ -77,7 +76,7 @@ class TranslationServiceProvider extends ServiceProvider
     }
 
     /**
-     * Gather json translations
+     * Gather json translations.
      *
      * @param string $locale
      * @return array<string, string>