X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/7a2bed7826daa04288eed02b303f6194f8908566..ba4cac691e8a7a3dd193680ee2414b6aac0c1088:/DependencyInjection/RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index c844233..4605e96 100644
--- 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,64 +15,20 @@ class RapsysPackExtension extends Extension {
 	 * {@inheritdoc}
 	 */
 	public function load(array $configs, ContainerBuilder $container) {
-		//Load configuration
-		#$loader = new Loader\YamlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-		$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);
 		}
-	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getConfiguration(array $configs, ContainerBuilder $container) {
-		//Get configuration instance with resolved public path
-		return new Configuration($container->getParameter('kernel.project_dir').'/public/');
+		//Save configuration in parameters
+		$container->setParameter($this->getAlias(), $config);
 	}
 
 	/**