mirror of
https://github.com/shlinkio/shlink.git
synced 2025-03-27 20:11:34 +03:00
Improved config loading so that autoloaded overrides module-specific
This commit is contained in:
parent
e28e984278
commit
aaf4f1dfe5
2 changed files with 3 additions and 2 deletions
|
@ -1,2 +1,3 @@
|
||||||
# url-shortener
|
# Shlink
|
||||||
|
|
||||||
A PHP-based URL shortener application with analytics and management
|
A PHP-based URL shortener application with analytics and management
|
||||||
|
|
|
@ -17,11 +17,11 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
|
||||||
|
|
||||||
return call_user_func(function () {
|
return call_user_func(function () {
|
||||||
$configManager = new ConfigManager([
|
$configManager = new ConfigManager([
|
||||||
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
|
|
||||||
Common\ConfigProvider::class,
|
Common\ConfigProvider::class,
|
||||||
Core\ConfigProvider::class,
|
Core\ConfigProvider::class,
|
||||||
CLI\ConfigProvider::class,
|
CLI\ConfigProvider::class,
|
||||||
Rest\ConfigProvider::class,
|
Rest\ConfigProvider::class,
|
||||||
|
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
|
||||||
], 'data/cache/app_config.php');
|
], 'data/cache/app_config.php');
|
||||||
|
|
||||||
return $configManager->getMergedConfig();
|
return $configManager->getMergedConfig();
|
||||||
|
|
Loading…
Add table
Reference in a new issue