Cleanup

[packbundle] / DependencyInjection / RapsysPackExtension.php

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 9bcd117bd526b627386362f9cd201eb50f69728c..c3b4a3bf4fa1b334f3c43a6453b7d58b54d92ee9 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -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,14 +15,34 @@ 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/');
+               //Load configuration
+               $configuration = $this->getConfiguration($configs, $container);
+
+               //Process the configuration to get merged config

                $config = $this->processConfiguration($configuration, $configs);
 
                $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);

        }
 
        }
 

+       /**
+        * {@inheritdoc}
+        */

        public function getConfiguration(array $configs, ContainerBuilder $container) {
        public function getConfiguration(array $configs, ContainerBuilder $container) {

-               return new Configuration($container->getParameter('kernel.project_dir').'/web/');
+               //Get configuration instance with resolved public path
+               return new Configuration($container->getParameter('kernel.project_dir').'/public/');
+       }
+
+       /**
+        * {@inheritdoc}
+        */
+       public function getAlias() {
+               return 'rapsys_pack';

        }
 }
        }
 }