From 71c7158c15264b58a6c9b17601bcc7ae80af96cd Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Thu, 9 Feb 2023 14:26:34 +0100 Subject: [PATCH 1/2] Move the view.php config file to the Framework package internals This file will usually not need to be edited, so it does not need to be bundled with the base project install. Having it in the framework package internals means we can still load the existing data, and users can publish the file if they need to modify it. Published config files should always take precedence. --- {config => packages/framework/config}/view.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {config => packages/framework/config}/view.php (100%) diff --git a/config/view.php b/packages/framework/config/view.php similarity index 100% rename from config/view.php rename to packages/framework/config/view.php From a467dbecd26b633beaf1237415b63938f1f638ff Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Thu, 9 Feb 2023 14:27:40 +0100 Subject: [PATCH 2/2] Update ConfigurationServiceProvider to merge the view config file --- .../src/Foundation/Providers/ConfigurationServiceProvider.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php b/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php index c6e5259bc67..7cc23186d81 100644 --- a/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php +++ b/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php @@ -25,6 +25,8 @@ public function register(): void $this->mergeConfigFrom(__DIR__.'/../../../config/docs.php', 'docs'); $this->mergeConfigFrom(__DIR__.'/../../../config/site.php', 'site'); $this->mergeConfigFrom(__DIR__.'/../../../config/markdown.php', 'markdown'); + + $this->mergeConfigFrom(__DIR__.'/../../../config/view.php', 'view'); } public function boot(): void