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

Moved routes config together, and ensure they are loaded last

Browse Source
This commit is contained in:
Alejandro Celaya
2022-08-04 11:14:26 +02:00
parent fdd3e24967
commit ba517eeeb5
8 changed files with 117 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/config.php
View File

@@ -36,14 +36,15 @@ return (new ConfigAggregator\ConfigAggregator([
Importer\ConfigProvider::class,
IpGeolocation\ConfigProvider::class,
EventDispatcher\ConfigProvider::class,
CLI\ConfigProvider::class,
Rest\ConfigProvider::class, // Load rest before Core, to prevent conflicting routes when multi-segment is enabled
Core\ConfigProvider::class,
CLI\ConfigProvider::class,
Rest\ConfigProvider::class,
new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
$isTestEnv
// TODO Test routes must be loaded before core config
? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')
: new ConfigAggregator\ArrayProvider([]),
// Routes have to be loaded last
new ConfigAggregator\PhpFileProvider('config/autoload/routes.config.php'),
], 'data/cache/app_config.php', [
Core\Config\BasePathPrefixer::class,
]))->getMergedConfig();