]> Raphaƫl G. Git Repositories - packbundle/blobdiff - DependencyInjection/RapsysPackExtension.php
Bump version
[packbundle] / DependencyInjection / RapsysPackExtension.php
index 7d660000e870b6679c0c9658c5cd714f87bcd336..4605e96f9ee071672366eede1a43a4b93c480086 100644 (file)
@@ -3,9 +3,7 @@
 namespace Rapsys\PackBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 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.
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -17,26 +15,20 @@ class RapsysPackExtension extends Extension {
         * {@inheritdoc}
         */
        public function load(array $configs, ContainerBuilder $container) {
         * {@inheritdoc}
         */
        public function load(array $configs, ContainerBuilder $container) {
-               //Load configuration
-               $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-               $loader->load('services.yml');
-
                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);
                //Load configuration
                $configuration = $this->getConfiguration($configs, $container);
+
+               //Process the configuration to get merged config
                $config = $this->processConfiguration($configuration, $configs);
 
                $config = $this->processConfiguration($configuration, $configs);
 
-               //Set default config in parameter
-               if (!$container->hasParameter($alias = $this->getAlias())) {
-                       $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 web path
-               return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+               //Save configuration in parameters
+               $container->setParameter($this->getAlias(), $config);
        }
 
        /**
        }
 
        /**