mirror of
https://github.com/shlinkio/shlink.git
synced 2024-11-22 00:47:25 -06:00
Improved main config file and fixed tests whitelist
This commit is contained in:
parent
aaf4f1dfe5
commit
31af0eea04
@ -15,14 +15,10 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
|
||||
* Obviously, if you use closures in your config you can't cache it.
|
||||
*/
|
||||
|
||||
return call_user_func(function () {
|
||||
$configManager = new ConfigManager([
|
||||
Common\ConfigProvider::class,
|
||||
Core\ConfigProvider::class,
|
||||
CLI\ConfigProvider::class,
|
||||
Rest\ConfigProvider::class,
|
||||
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
|
||||
], 'data/cache/app_config.php');
|
||||
|
||||
return $configManager->getMergedConfig();
|
||||
});
|
||||
return (new ConfigManager([
|
||||
Common\ConfigProvider::class,
|
||||
Core\ConfigProvider::class,
|
||||
CLI\ConfigProvider::class,
|
||||
Rest\ConfigProvider::class,
|
||||
new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
|
||||
], 'data/cache/app_config.php'))->getMergedConfig();
|
||||
|
@ -16,7 +16,10 @@
|
||||
|
||||
<filter>
|
||||
<whitelist processUncoveredFilesFromWhitelist="true">
|
||||
<directory suffix=".php">src</directory>
|
||||
<directory suffix=".php">./module/Common/src</directory>
|
||||
<directory suffix=".php">./module/Core/src</directory>
|
||||
<directory suffix=".php">./module/Rest/src</directory>
|
||||
<directory suffix=".php">./module/CLI/src</directory>
|
||||
</whitelist>
|
||||
</filter>
|
||||
</phpunit>
|
||||
|
Loading…
Reference in New Issue
Block a user