Remove slugger utils (moved in rapsys_pack)

[userbundle] / DependencyInjection / RapsysUserExtension.php

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 56e5dabd084594f6478b20d6422f8230883b58b6..6dd55c74a60c73f0728f2a688c21b8096ec7dc0b 100644 (file)
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -3,9 +3,7 @@
 namespace Rapsys\UserBundle\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,28 +15,20 @@ class RapsysUserExtension 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);
+
+               //Process the configuration to get merged config
                $config = $this->processConfiguration($configuration, $configs);
 
-               //Set default config in parameter
-               if (!$container->hasParameter($alias = $this->getAlias())) {
-                       $container->setParameter($alias, $config[$alias]);
-               } else {
-                       $config[$alias] = $container->getParameter($alias);
+               //Detect when no user configuration is provided
+               if ($configs === [[]]) {
+                       //Prepend default config
+                       $container->prependExtensionConfig($this->getAlias(), $config);
                }
 
-               //Transform the two level tree in flat parameters
-               foreach($config[$alias] as $k => $v) {
-                       foreach($v as $s => $d) {
-                               //Set is as parameters
-                               $container->setParameter($alias.'.'.$k.'.'.$s, $d);
-                       }
-               }
+               //Save configuration in parameters
+               $container->setParameter($this->getAlias(), $config);
        }
 
        /**
@@ -56,7 +46,7 @@ class RapsysUserExtension extends Extension {
         * @param $depth        The maxmium depth
         * @param $sep          The separator string
         */
-       /*protected function flatten($array, $path, $depth = 10, $sep = '.') {
+       /*protected function flatten($array, $path = '', $depth = 10, $sep = '.') {
                //Init res
                $res = array();