From 4537175951e2472043fe53a39a3896ea9095198c Mon Sep 17 00:00:00 2001
From: Hui Yang <chy1988@antwebstudio.com>
Date: Sat, 9 Apr 2022 17:14:14 +0800
Subject: [PATCH 1/3] fix so that app config will overwrite fusion config

---
 src/Providers/ConfigServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Providers/ConfigServiceProvider.php b/src/Providers/ConfigServiceProvider.php
index 50806334..037b2473 100755
--- a/src/Providers/ConfigServiceProvider.php
+++ b/src/Providers/ConfigServiceProvider.php
@@ -116,8 +116,8 @@ protected function mergeFusionCMSConfigurations()
             $this->app['config']->set(
                 $name,
                 Arr::mergeDeep(
-                    $this->app['config']->get($name, []),
                     require $path,
+                    $this->app['config']->get($name, []),
                 )
             );
         }

From df4102e43401eb3f81c0fc4d4b0a5bac408f3ebd Mon Sep 17 00:00:00 2001
From: Hui Yang <chy1988@antwebstudio.com>
Date: Thu, 21 Jul 2022 21:50:44 +0800
Subject: [PATCH 2/3] fix so that fusioncms won't overwrite the whole
 "services" config, causing other services not working

---
 src/Providers/ConfigServiceProvider.php | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/Providers/ConfigServiceProvider.php b/src/Providers/ConfigServiceProvider.php
index 037b2473..180dc15a 100755
--- a/src/Providers/ConfigServiceProvider.php
+++ b/src/Providers/ConfigServiceProvider.php
@@ -44,24 +44,10 @@ public function boot()
      */
     protected function registerMailServices()
     {
-        $this->app['config']['services'] = [
-
-            // SparkPost service settings..
-            'sparkpost' => [
-                'secret' => setting('mail.mail_sparkpost_secret'),
-            ],
-
-            // Mailgun service settings..
-            'mailgun' => [
-                'domain' => setting('mail.mail_mailgun_domain'),
-                'secret' => setting('mail.mail_mailgun_secret'),
-            ],
-
-            // Mandrill service settings..
-            'mandrill' => [
-                'secret' => setting('mail.mail_mandrill_secret'),
-            ],
-        ];
+		config(['sparkpost.secret' => setting('mail.mail_sparkpost_secret')]);
+		config(['mailgun.domain' => setting('mail.mail_mailgun_domain')]);
+		config(['mailgun.secret' => setting('mail.mail_mailgun_secret')]);
+		config(['mandrill.secret' => setting('mail.mail_mandrill_secret')]);
     }
 
     /**

From d86c702a08487a7dbffaad2fbc3f77f585e5f5f2 Mon Sep 17 00:00:00 2001
From: Hui Yang <chy1988@gmail.com>
Date: Wed, 3 Aug 2022 20:36:17 +0800
Subject: [PATCH 3/3] fix bug where elements of array missing when their value
 is duplicated, although their key is different

---
 src/Providers/ConfigServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Providers/ConfigServiceProvider.php b/src/Providers/ConfigServiceProvider.php
index 180dc15a..d4924d39 100755
--- a/src/Providers/ConfigServiceProvider.php
+++ b/src/Providers/ConfigServiceProvider.php
@@ -67,7 +67,6 @@ protected function registerMacro()
 
                 if (is_array($value) && is_array($arr2[$key])) {
                     $output[$key] = Arr::mergeDeep($value, $arr2[$key]);
-                    $output[$key] = array_unique($output[$key], SORT_REGULAR);
                 }
             }