configuration improvements (#1784)

This commit is contained in:
Kevin Papst
2020-06-16 18:35:09 +02:00
committed by GitHub
parent ea4e930cbb
commit 470a6b30e0
9 changed files with 42 additions and 28 deletions

View File

@@ -52,7 +52,9 @@ class AppExtension extends Extension
$config['export']['documents'] = array_merge($config['export']['documents'], $config['export']['defaults']);
unset($config['export']['defaults']);
// safe alternatives to %kernel.project_dir%
if (empty($config['data_dir'])) {
$config['data_dir'] = $container->getParameter('kernel.project_dir') . '/var/data';
}
$container->setParameter('kimai.data_dir', $config['data_dir']);
$container->setParameter('kimai.plugin_dir', $container->getParameter('kernel.project_dir') . '/var/plugins');

View File

@@ -37,9 +37,13 @@ class Configuration implements ConfigurationInterface
$node
->children()
->scalarNode('data_dir')
->isRequired()
->defaultNull()
->validate()
->ifTrue(function ($value) {
if (null === $value) {
return false;
}
return !file_exists($value);
})
->thenInvalid('Data directory does not exist')