OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated to latest shlink-installer and shlink-config, ensuring env vars are properly loaded

Browse Source
This commit is contained in:
Alejandro Celaya
2022-01-15 16:06:24 +01:00
parent c6f16b0558
commit 91192a8a8f
3 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.php
View File

@@ -9,10 +9,10 @@ use Laminas\Diactoros;
use Mezzio;
use Mezzio\ProblemDetails;
use Mezzio\Swoole;
use Shlinkio\Shlink\Config\ConfigAggregator\EnvVarLoaderProvider;
use function class_exists;
use function Shlinkio\Shlink\Config\env;
use function Shlinkio\Shlink\Core\putNotYetDefinedEnv;
use const PHP_SAPI;
@@ -21,15 +21,7 @@ $isTestEnv = env('APP_ENV') === 'test';
return (new ConfigAggregator\ConfigAggregator([
! $isTestEnv
? new ConfigAggregator\ArrayProvider((new ConfigAggregator\ConfigAggregator([
new ConfigAggregator\PhpFileProvider('config/params/generated_config.php'),
], null, [function (array $generatedConfig) {
foreach ($generatedConfig as $envVar => $value) {
putNotYetDefinedEnv($envVar, $value);
}
return [];
}]))->getMergedConfig())
? new EnvVarLoaderProvider('config/params/generated_config.php')
: new ConfigAggregator\ArrayProvider([]),
Mezzio\ConfigProvider::class,
Mezzio\Router\ConfigProvider::class,