bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Marcel Pociot
2020-04-27 10:05:42 +02:00
parent 28c4009dff
commit 054e5b6a86
20 changed files with 737 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Providers/AppServiceProvider.php
View File

@@ -31,10 +31,13 @@ class AppServiceProvider extends ServiceProvider
protected function loadConfigurationFile()
{
$builtInConfig = config('expose');
$localConfigFile = getcwd() . DIRECTORY_SEPARATOR . '.expose.php';
if (file_exists($localConfigFile)) {
config()->set('expose', require_once $localConfigFile);
$localConfig = require_once $localConfigFile;
config()->set('expose', array_merge($builtInConfig, $localConfig));
return;
}
@@ -46,7 +49,8 @@ class AppServiceProvider extends ServiceProvider
]);
if (file_exists($configFile)) {
config()->set('expose', require_once $configFile);
$globalConfig = require_once $configFile;
config()->set('expose', array_merge($builtInConfig, $globalConfig));
}
}
}