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

Improved main config file and fixed tests whitelist

Browse Source
This commit is contained in:
Alejandro Celaya 2016-07-19 23:35:47 +02:00
parent aaf4f1dfe5
commit 31af0eea04
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.php
View File

@ -15,14 +15,10 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
* Obviously, if you use closures in your config you can't cache it. * Obviously, if you use closures in your config you can't cache it.
*/ */
return call_user_func(function () { return (new ConfigManager([
$configManager = new ConfigManager([
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'), new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
], 'data/cache/app_config.php'); ], 'data/cache/app_config.php'))->getMergedConfig();
return $configManager->getMergedConfig();
});

5
phpunit.xml.dist
View File

@ -16,7 +16,10 @@
<filter> <filter>
<whitelist processUncoveredFilesFromWhitelist="true"> <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> </whitelist>
</filter> </filter>
</phpunit> </phpunit>