X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/841a8835e903a514e2e44706bf4974f3cc21104b..ba4cac691e8a7a3dd193680ee2414b6aac0c1088:/DependencyInjection/RapsysPackExtension.php?ds=sidebyside

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 9bcd117..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,14 +15,26 @@ class RapsysPackExtension extends Extension {
 	 * {@inheritdoc}
 	 */
 	public function load(array $configs, ContainerBuilder $container) {
-		$configuration = new Configuration($container->getParameter('kernel.project_dir').'/web/');
+		//Load configuration
+		$configuration = $this->getConfiguration($configs, $container);
+
+		//Process the configuration to get merged config
 		$config = $this->processConfiguration($configuration, $configs);
 
-		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-		$loader->load('services.yml');
+		//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);
 	}
 
-	public function getConfiguration(array $configs, ContainerBuilder $container) {
-		return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAlias() {
+		return 'rapsys_pack';
 	}
 }