From 7c6d446b87e2642c2702cb0d9adc0ed1b5d9a33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 20 Oct 2016 12:07:48 +0200 Subject: [PATCH] allow empty configuration for widgets --- .gitignore | 1 + DependencyInjection/ChillMainExtension.php | 5 ++++- DependencyInjection/Configuration.php | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 95bd3013c..7923548b4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ Resources/public/sass/* !Resources/public/sass/_timeline.scss !Resources/public/sass/custom/ +/nbproject/private/ \ No newline at end of file diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php index e3a0f0d25..feafc9f04 100644 --- a/DependencyInjection/ChillMainExtension.php +++ b/DependencyInjection/ChillMainExtension.php @@ -77,7 +77,10 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, // add the key 'widget' without the key 'enable' $container->setParameter('chill_main.widgets', - array('homepage' => $config['widgets']['homepage'])); + isset($config['widgets']['homepage']) ? + array('homepage' => $config['widgets']['homepage']): + array() + ); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 21c0d6a84..52fce914f 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -68,7 +68,8 @@ class Configuration implements ConfigurationInterface ->end() // end of children ->end() // end of pagination ->arrayNode('widgets') - ->canBeDisabled() + ->canBeEnabled() + ->canBeUnset() ->children() ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder)) ->end() // end of widgets/children