Merge pull request #944 from hydephp/update-configuration-service-provider

emmadesilva · web-flow · commit 86764a556b65 · 2023-02-09T13:16:45.000+01:00
Merge configuration files in configuration service provider
diff --git a/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php b/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php
@@ -21,7 +21,10 @@ public function initialize(): void
 
     public function register(): void
     {
-        //
+        $this->mergeConfigFrom(__DIR__.'/../../../config/hyde.php', 'hyde');
+        $this->mergeConfigFrom(__DIR__.'/../../../config/docs.php', 'docs');
+        $this->mergeConfigFrom(__DIR__.'/../../../config/site.php', 'site');
+        $this->mergeConfigFrom(__DIR__.'/../../../config/markdown.php', 'markdown');
     }
 
     public function boot(): void

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,10 @@ public function initialize(): void`
`21`	`21`
`22`	`22`	`public function register(): void`
`23`	`23`	`{`
`24`		`- //`
	`24`	`+ $this->mergeConfigFrom(__DIR__.'/../../../config/hyde.php', 'hyde');`
	`25`	`+ $this->mergeConfigFrom(__DIR__.'/../../../config/docs.php', 'docs');`
	`26`	`+ $this->mergeConfigFrom(__DIR__.'/../../../config/site.php', 'site');`
	`27`	`+ $this->mergeConfigFrom(__DIR__.'/../../../config/markdown.php', 'markdown');`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`public function boot(): void`