From: Raphaël Gertz <git@rapsys.eu>
Date: Thu, 7 Nov 2019 02:49:15 +0000 (+0100)
Subject: Move configuration under rapsys_user key
X-Git-Tag: 0.0.2~2
X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/ba604d9d493cbee780c6345c89bab69395117319?ds=inline;hp=9b4ee0f61a50727fec7831aec3b485fdcb8115fa

Move configuration under rapsys_user key
Cleanup
---

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 56e5dab..d026ae4 100644
--- 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);
 	}
 
 	/**