configuration improvements (#1784)
This commit is contained in:
@@ -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');
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user