X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/efa6c60e1cbb85c6b36745e3570e71bb2f92b7ce..776c977f27292e536619c2bd70cabdbcc118d5e4:/DependencyInjection/RapsysUserExtension.php?ds=sidebyside

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 56e5dab..1c1d1cf 100644
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -3,9 +3,9 @@
 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;
+
+use Rapsys\UserBundle\RapsysUserBundle;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -17,35 +17,27 @@ 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(self::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(self::getAlias(), $config);
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getAlias() {
-		return 'rapsys_user';
+	public function getAlias(): string {
+		return RapsysUserBundle::getAlias();
 	}
 
 	/**
@@ -56,7 +48,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();