Move the configuration in rapsys_pack key

Cleanup
Use symfony smart config merging
Enforce default config when none is defined

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index bc155fc6a0cd6925e7885cd2144c0c1211737753..c3b4a3bf4fa1b334f3c43a6453b7d58b54d92ee9 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -3,9 +3,7 @@
 namespace Rapsys\PackBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -17,55 +15,20 @@ class RapsysPackExtension extends Extension {
         * {@inheritdoc}
         */
        public function load(array $configs, ContainerBuilder $container) {
-               //Load configuration
-               $loader = new Loader\YamlFileLoader($container, new FileLocator('config/packages'));
-               $loader->load($this->getAlias().'.yaml');
-
                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);
-               $config = $this->processConfiguration($configuration, $configs);
 
-               //Set default config in parameter
-               if (!$container->hasParameter($alias = $this->getAlias())) {
-                       $container->setParameter($alias, $config[$alias]);
-               //Fill missing entries
-               } else {
-                       //Change in config flag
-                       $change = false;
-
-                       //Iterate on each user configuration keys
-                       foreach($container->getParameter($alias) as $k => $v) {
-                               //Check if value is an array
-                               if (is_array($v)) {
-                                       //Iterate on each array keys
-                                       foreach($v as $sk => $sv) {
-                                               //Check if sub value is an array
-                                               if (is_array($sv)) {
-                                                       //TODO: implement sub sub key merging ? (or recursive ?)
-                                                       @trigger_error('Nested level > 2 not yet implemented here', E_USER_ERROR);
-                                               //Save sub value
-                                               } else {
-                                                       //Trigger changed flag
-                                                       $change = true;
-                                                       //Replace default value with user provided one
-                                                       $config[$alias][$k][$sk] = $sv;
-                                               }
-                                       }
-                               //Save value
-                               } else {
-                                       //Trigger changed flag
-                                       $change = true;
-                                       //Replace default value with user provided one
-                                       $config[$alias][$k] = $v;
-                               }
-                       }
+               //Process the configuration to get merged config
+               $config = $this->processConfiguration($configuration, $configs);
 
-                       //Check if change occured
-                       if ($change) {
-                               //Save parameters
-                               $container->setParameter($alias, $config[$alias]);
-                       }
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($this->getAlias(), $config);
                }
+
+               //Save configuration in parameters
+               $container->setParameter($this->getAlias(), $config);
        }
 
        /**