From de5b5cf18afbb9b1d956ede9325ce6c137bcad12 Mon Sep 17 00:00:00 2001 From: Keith Brink Date: Tue, 20 Aug 2024 15:14:16 +0300 Subject: [PATCH 1/2] Remove config merge --- src/Bridge/Laravel/Providers/CycleServiceProvider.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Bridge/Laravel/Providers/CycleServiceProvider.php b/src/Bridge/Laravel/Providers/CycleServiceProvider.php index a27edde1..f10676df 100644 --- a/src/Bridge/Laravel/Providers/CycleServiceProvider.php +++ b/src/Bridge/Laravel/Providers/CycleServiceProvider.php @@ -46,15 +46,7 @@ public function boot(): void } public function register(): void - { - // @phpstan-ignore-next-line - if (! $this->app->configurationIsCached()) { - $this->mergeConfigFrom( - __DIR__ . '/../../../../config/cycle.php', - Registrator::CFG_KEY - ); - } - + { $registrators = [ Registrators\RegisterConfigs::class, Registrators\RegisterTokenizer::class, From 99c0bbbaeb2e42dd542132f3c8efd358e348c221 Mon Sep 17 00:00:00 2001 From: Keith Brink Date: Tue, 20 Aug 2024 15:35:40 +0300 Subject: [PATCH 2/2] Don't merge config if config is published --- .../Laravel/Providers/CycleServiceProvider.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Bridge/Laravel/Providers/CycleServiceProvider.php b/src/Bridge/Laravel/Providers/CycleServiceProvider.php index f10676df..dcbca819 100644 --- a/src/Bridge/Laravel/Providers/CycleServiceProvider.php +++ b/src/Bridge/Laravel/Providers/CycleServiceProvider.php @@ -46,7 +46,17 @@ public function boot(): void } public function register(): void - { + { + $config = $this->app->make('config'); + + // @phpstan-ignore-next-line + if (! $this->app->configurationIsCached() && ! $config->get('cycle')) { + $this->mergeConfigFrom( + __DIR__ . '/../../../../config/cycle.php', + Registrator::CFG_KEY + ); + } + $registrators = [ Registrators\RegisterConfigs::class, Registrators\RegisterTokenizer::class,