diff --git a/Modules/Activity/Providers/ActivityServiceProvider.php b/Modules/Activity/Providers/ActivityServiceProvider.php index d41dab5..b10946a 100644 --- a/Modules/Activity/Providers/ActivityServiceProvider.php +++ b/Modules/Activity/Providers/ActivityServiceProvider.php @@ -141,6 +141,10 @@ class ActivityServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/ActivityLog/Providers/ActivityLogServiceProvider.php b/Modules/ActivityLog/Providers/ActivityLogServiceProvider.php index 69101d9..4146b75 100644 --- a/Modules/ActivityLog/Providers/ActivityLogServiceProvider.php +++ b/Modules/ActivityLog/Providers/ActivityLogServiceProvider.php @@ -116,6 +116,10 @@ class ActivityLogServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/Auth/Providers/AuthServiceProvider.php b/Modules/Auth/Providers/AuthServiceProvider.php index 8342818..27a68c0 100644 --- a/Modules/Auth/Providers/AuthServiceProvider.php +++ b/Modules/Auth/Providers/AuthServiceProvider.php @@ -127,6 +127,10 @@ class AuthServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/Dashboard/Providers/DashboardServiceProvider.php b/Modules/Dashboard/Providers/DashboardServiceProvider.php index c132690..c0f37d7 100644 --- a/Modules/Dashboard/Providers/DashboardServiceProvider.php +++ b/Modules/Dashboard/Providers/DashboardServiceProvider.php @@ -126,6 +126,10 @@ class DashboardServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/ExternalSystem/Providers/ExternalSystemServiceProvider.php b/Modules/ExternalSystem/Providers/ExternalSystemServiceProvider.php index 5475e39..6b9e82b 100644 --- a/Modules/ExternalSystem/Providers/ExternalSystemServiceProvider.php +++ b/Modules/ExternalSystem/Providers/ExternalSystemServiceProvider.php @@ -113,6 +113,10 @@ class ExternalSystemServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/Feedback/Providers/FeedbackServiceProvider.php b/Modules/Feedback/Providers/FeedbackServiceProvider.php index f3373ba..bef6f71 100644 --- a/Modules/Feedback/Providers/FeedbackServiceProvider.php +++ b/Modules/Feedback/Providers/FeedbackServiceProvider.php @@ -117,6 +117,10 @@ class FeedbackServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/MembershipApplication/Providers/MembershipApplicationServiceProvider.php b/Modules/MembershipApplication/Providers/MembershipApplicationServiceProvider.php index bef9c73..6dbe694 100644 --- a/Modules/MembershipApplication/Providers/MembershipApplicationServiceProvider.php +++ b/Modules/MembershipApplication/Providers/MembershipApplicationServiceProvider.php @@ -143,6 +143,10 @@ class MembershipApplicationServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/Notification/Providers/NotificationServiceProvider.php b/Modules/Notification/Providers/NotificationServiceProvider.php index 9c14bd8..0a44ba5 100644 --- a/Modules/Notification/Providers/NotificationServiceProvider.php +++ b/Modules/Notification/Providers/NotificationServiceProvider.php @@ -111,6 +111,10 @@ class NotificationServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/Role/Providers/RoleServiceProvider.php b/Modules/Role/Providers/RoleServiceProvider.php index 6376bb6..43735c9 100644 --- a/Modules/Role/Providers/RoleServiceProvider.php +++ b/Modules/Role/Providers/RoleServiceProvider.php @@ -117,6 +117,10 @@ class RoleServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path; diff --git a/Modules/User/Providers/UserServiceProvider.php b/Modules/User/Providers/UserServiceProvider.php index e9f7dba..cf515f6 100644 --- a/Modules/User/Providers/UserServiceProvider.php +++ b/Modules/User/Providers/UserServiceProvider.php @@ -179,6 +179,10 @@ class UserServiceProvider extends ServiceProvider */ protected function merge_config_from(string $path, string $key): void { + if ($this->app->configurationIsCached()) { + return; + } + $existing = config($key, []); $module_config = require $path;