Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-27 01:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix conflict in CHANGELOG

Browse Source
This commit is contained in:
nobohan
2021-11-08 12:41:11 +01:00
parent e786c40679 061197e52e
commit c979de962e
21 changed files with 287 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
View File

@@ -107,6 +107,9 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
$container->setParameter('chill_main.available_languages',
$config['available_languages']);
$container->setParameter('chill_main.available_countries',
$config['available_countries']);
$container->setParameter('chill_main.routing.resources',
$config['routing']['resources']);

4
src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
View File

@@ -51,6 +51,10 @@ class Configuration implements ConfigurationInterface
->defaultValue(array('fr'))
->prototype('scalar')->end()
->end() // end of array 'available_languages'
->arrayNode('available_countries')
->defaultValue(array('FR'))
->prototype('scalar')->end()
->end() // end of array 'available_countries'
->arrayNode('routing')
->children()
->arrayNode('resources')