Fix default configuration tree

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index b200abd3a04137f4c94fcda57dd9e2a1de41abe1..5397036876f65a11a5ab899c58aea423977d2d6b 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -12,17 +12,30 @@ use Symfony\Component\DependencyInjection\Loader;
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
-class RapsysPackExtension extends Extension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+class RapsysPackExtension extends Extension {
+       /**
+        * {@inheritdoc}
+        */
+       public function load(array $configs, ContainerBuilder $container) {
+               //Load configuration
+               $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+               $loader->load('services.yml');
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-    }
+               //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]);
+               }
+       }
+
+       /**
+        * {@inheritdoc}
+        */
+       public function getConfiguration(array $configs, ContainerBuilder $container) {
+               //Get configuration instance with resolved web path
+               return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+       }
 }