Merge pull request #1020 from hydephp/refactor-internal-load-configuration-class

emmadesilva · web-flow · commit 9c41ddbcd1b7 · 2023-02-13T19:16:07.000+01:00
Refactor internal LoadConfiguration class
diff --git a/packages/framework/src/Foundation/Internal/LoadConfiguration.php b/packages/framework/src/Foundation/Internal/LoadConfiguration.php
@@ -25,23 +25,27 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $
     {
         parent::loadConfigurationFiles($app, $repository);
 
-        $this->mergeConfigurationFiles($repository, ['view', 'cache', 'commands', 'torchlight']);
+        $this->mergeConfigurationFiles($repository);
     }
 
-    /** These files do commonly not need to be customized by the user, so to get them out of the way, we don't include them in the default project install. */
-    protected function mergeConfigurationFiles(RepositoryContract $repository, array $keys): void
+    private function mergeConfigurationFiles(RepositoryContract $repository): void
     {
-        foreach ($keys as $key) {
-            $this->mergeConfigurationFile($repository, $key);
+        // These files do commonly not need to be customized by the user, so to get them out of the way,
+        // we don't include them in the default project install.
+
+        foreach (['view', 'cache', 'commands', 'torchlight'] as $file) {
+            $this->mergeConfigurationFile($repository, $file);
         }
     }
 
-    /** We of course want the user to be able to customize the config files, if they're present, so we'll merge their changes here. */
-    protected function mergeConfigurationFile(RepositoryContract $repository, string $key): void
+    private function mergeConfigurationFile(RepositoryContract $repository, string $file): void
     {
-        $repository->set($key, array_merge(
-            require __DIR__."/../../../config/$key.php",
-            $repository->get($key, [])
+        // We of course want the user to be able to customize the config files,
+        // if they're present, so we'll merge their changes here.
+
+        $repository->set($file, array_merge(
+            require __DIR__."/../../../config/$file.php",
+            (array) $repository->get($file, [])
         ));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,23 +25,27 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $`
`25`	`25`	`{`
`26`	`26`	`parent::loadConfigurationFiles($app, $repository);`
`27`	`27`
`28`		`- $this->mergeConfigurationFiles($repository, ['view', 'cache', 'commands', 'torchlight']);`
	`28`	`+ $this->mergeConfigurationFiles($repository);`
`29`	`29`	`}`
`30`	`30`
`31`		`- /** These files do commonly not need to be customized by the user, so to get them out of the way, we don't include them in the default project install. */`
`32`		`- protected function mergeConfigurationFiles(RepositoryContract $repository, array $keys): void`
	`31`	`+ private function mergeConfigurationFiles(RepositoryContract $repository): void`
`33`	`32`	`{`
`34`		`- foreach ($keys as $key) {`
`35`		`- $this->mergeConfigurationFile($repository, $key);`
	`33`	`+ // These files do commonly not need to be customized by the user, so to get them out of the way,`
	`34`	`+ // we don't include them in the default project install.`
	`35`	`+`
	`36`	`+ foreach (['view', 'cache', 'commands', 'torchlight'] as $file) {`
	`37`	`+ $this->mergeConfigurationFile($repository, $file);`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`
`39`		`- /** We of course want the user to be able to customize the config files, if they're present, so we'll merge their changes here. */`
`40`		`- protected function mergeConfigurationFile(RepositoryContract $repository, string $key): void`
	`41`	`+ private function mergeConfigurationFile(RepositoryContract $repository, string $file): void`
`41`	`42`	`{`
`42`		`- $repository->set($key, array_merge(`
`43`		`- require __DIR__."/../../../config/$key.php",`
`44`		`- $repository->get($key, [])`
	`43`	`+ // We of course want the user to be able to customize the config files,`
	`44`	`+ // if they're present, so we'll merge their changes here.`
	`45`	`+`
	`46`	`+ $repository->set($file, array_merge(`
	`47`	`+ require __DIR__."/../../../config/$file.php",`
	`48`	`+ (array) $repository->get($file, [])`
`45`	`49`	`));`
`46`	`50`	`}`
`47`	`51`	`}`