Fix filters structure

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 9bcd117bd526b627386362f9cd201eb50f69728c..5397036876f65a11a5ab899c58aea423977d2d6b 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -17,14 +17,25 @@ class RapsysPackExtension extends Extension {
         * {@inheritdoc}
         */
        public function load(array $configs, ContainerBuilder $container) {
         * {@inheritdoc}
         */
        public function load(array $configs, ContainerBuilder $container) {

-               $configuration = new Configuration($container->getParameter('kernel.project_dir').'/web/');
-               $config = $this->processConfiguration($configuration, $configs);
-
+               //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) {
        public function getConfiguration(array $configs, ContainerBuilder $container) {

+               //Get configuration instance with resolved web path

                return new Configuration($container->getParameter('kernel.project_dir').'/web/');
        }
 }
                return new Configuration($container->getParameter('kernel.project_dir').'/web/');
        }
 }