Load configuration by default

Fix bundle configuration tree

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 00417437754a62e722c8ff89147a1012a96eb6d9..1ea8231b43f7cb71c996118f1e6320d99bf9975a 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -21,7 +21,10 @@ class Configuration implements ConfigurationInterface {
         * {@inheritdoc}
         */
        public function getConfigTreeBuilder() {
         * {@inheritdoc}
         */
        public function getConfigTreeBuilder() {

+               //Get TreeBuilder object

                $treeBuilder = new TreeBuilder();
                $treeBuilder = new TreeBuilder();

+
+               //Get ExecutableFinder object

                $finder = new ExecutableFinder();
 
                #TODO: see how we deal with asset url generation: see Rapsys/PackBundle/Twig/PackTokenParser.php +243
                $finder = new ExecutableFinder();
 
                #TODO: see how we deal with asset url generation: see Rapsys/PackBundle/Twig/PackTokenParser.php +243


@@ -36,50 +39,93 @@ class Configuration implements ConfigurationInterface {
                ##twig:
                ##    cache: ~
 
                ##twig:
                ##    cache: ~
 

-               //Here we define the parameters that are allowed to configure the bundle.

                //TODO: see https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php for default value and description
                //TODO: see http://symfony.com/doc/current/components/config/definition.html
                //TODO: see https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
                //TODO: use bin/console config:dump-reference to dump class infos
                //TODO: see https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php for default value and description
                //TODO: see http://symfony.com/doc/current/components/config/definition.html
                //TODO: see https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
                //TODO: use bin/console config:dump-reference to dump class infos

+
+               //The bundle default values
+               $defaults = [
+                       'config' => [
+                               'prefix' => $this->projectDir,
+                               'scheme' => 'https://',
+                               'timeout' => (int)ini_get('default_socket_timeout'),
+                               'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.0.2',
+                               'redirect' => 5
+                       ],
+                       'output' => [
+                               'css' => 'css/*.pack.css',
+                               'js' => 'js/*.pack.js',
+                               'img' => 'img/*.pack.jpg'
+                       ],
+                       'filter' => [
+                               'css' => [
+                                       'Rapsys\PackBundle\Twig\Filter\CPackFilter' => [$finder->find('cpack', '/usr/local/bin/cpack')]
+                               ],
+                               'js' => [
+                                       'Rapsys\PackBundle\Twig\Filter\JPackFilter' => [$finder->find('jpack', '/usr/local/bin/jpack')]
+                               ],
+                               'img' => [
+                                       'Rapsys\PackBundle\Twig\Filter\IPackFilter' => []
+                               ],
+                       ]
+               ];
+
+               //Here we define the parameters that are allowed to configure the bundle.

                $treeBuilder
                        //Parameters
                        ->root('parameters')
                $treeBuilder
                        //Parameters
                        ->root('parameters')

+                               ->isRequired()
+                               ->addDefaultsIfNotSet()

                                ->children()
                                        ->arrayNode('rapsys_pack')
                                ->children()
                                        ->arrayNode('rapsys_pack')

+                                               ->isRequired()
+                                               ->addDefaultsIfNotSet()

                                                ->children()
                                                ->children()

-                                                       ->scalarNode('coutput')->defaultValue('css/*.pack.css')->end()
-                                                       ->scalarNode('joutput')->defaultValue('js/*.pack.js')->end()
-                                                       ->scalarNode('ioutput')->defaultValue('img/*.pack.jpg')->end()
-                                                       ->arrayNode('cfilter')
-                                                               ->treatNullLike(array())
-                                                               ->scalarPrototype()->end()
-                                                               ->defaultValue(array('Rapsys\PackBundle\Twig\Filter\CPackFilter'))
+                                                       ->arrayNode('config')
+                                                               ->isRequired()
+                                                               ->addDefaultsIfNotSet()
+                                                               ->children()
+                                                                       ->scalarNode('prefix')->isRequired()->defaultValue($defaults['config']['prefix'])->end()
+                                                                       ->scalarNode('scheme')->isRequired()->defaultValue($defaults['config']['scheme'])->end()
+                                                                       ->integerNode('timeout')->isRequired()->min(0)->defaultValue($defaults['config']['timeout'])->end()
+                                                                       ->scalarNode('agent')->isRequired()->defaultValue($defaults['config']['agent'])->end()
+                                                                       ->integerNode('redirect')->isRequired()->min(1)->defaultValue($defaults['config']['redirect'])->end()
+                                                               ->end()

                                                        ->end()
                                                        ->end()

-                                                       ->arrayNode('jfilter')
-                                                               ->treatNullLike(array())
-                                                               ->scalarPrototype()->end()
-                                                               ->defaultValue(array('Rapsys\PackBundle\Twig\Filter\JPackFilter'))
+                                                       ->arrayNode('output')
+                                                               ->isRequired()
+                                                               ->addDefaultsIfNotSet()
+                                                               ->children()
+                                                                       ->scalarNode('css')->isRequired()->defaultValue($defaults['output']['css'])->end()
+                                                                       ->scalarNode('js')->isRequired()->defaultValue($defaults['output']['js'])->end()
+                                                                       ->scalarNode('img')->isRequired()->defaultValue($defaults['output']['img'])->end()
+                                                               ->end()

                                                        ->end()
                                                        ->end()

-                                                       ->arrayNode('ifilter')
-                                                               ->treatNullLike(array())
-                                                               ->scalarPrototype()->end()
-                                                               ->defaultValue(array('Rapsys\PackBundle\Twig\Filter\IPackFilter'))
+                                                       ->arrayNode('filter')
+                                                               ->isRequired()
+                                                               ->addDefaultsIfNotSet()
+                                                               ->children()
+                                                                       ->arrayNode('css')
+                                                                               ->isRequired()
+                                                                               ->treatNullLike(array())
+                                                                               ->scalarPrototype()->end()
+                                                                               ->defaultValue($defaults['filter']['css'])
+                                                                       ->end()
+                                                                       ->arrayNode('js')
+                                                                               ->isRequired()
+                                                                               ->treatNullLike(array())
+                                                                               ->scalarPrototype()->end()
+                                                                               ->defaultValue($defaults['filter']['js'])
+                                                                       ->end()
+                                                                       ->arrayNode('img')
+                                                                               ->isRequired()
+                                                                               ->treatNullLike(array())
+                                                                               ->scalarPrototype()->end()
+                                                                               ->defaultValue($defaults['filter']['img'])
+                                                                       ->end()
+                                                               ->end()

                                                        ->end()
                                                        ->end()

-                                                       ->scalarNode('prefix')->defaultValue($this->projectDir)->end()
-                                                       ->scalarNode('scheme')->defaultValue('https://')->end()
-                                                       ->integerNode('timeout')->min(0)->defaultValue((int)ini_get('default_socket_timeout'))->end()
-                                                       ->scalarNode('agent')->defaultValue(ini_get('user_agent'))->end()
-                                                       ->integerNode('redirect')->min(1)->defaultValue(20)->end()
-                                               ->end()
-                                       ->end()
-                                       ->arrayNode('rapsys_pack_cpackfilter')
-                                               ->children()
-                                                       ->scalarNode('bin')->defaultValue(function () use ($finder) { return $finder->find('cpack', '/usr/local/bin/cpack'); })->end()
-                                               ->end()
-                                       ->end()
-                                       ->arrayNode('rapsys_pack_jpackfilter')
-                                               ->children()
-                                                       ->scalarNode('bin')->defaultValue(function () use ($finder) { return $finder->find('jpack', '/usr/local/bin/jpack'); })->end()

                                                ->end()
                                        ->end()
                                ->end()
                                                ->end()
                                        ->end()
                                ->end()

diff --git a/DependencyInjection/RapsysPackExtension.php b/DependencyInjection/RapsysPackExtension.php
index 9bcd117bd526b627386362f9cd201eb50f69728c..97bb11f3b23c0200688e169dda382edc6cfa7a0f 100644 (file)
--- a/DependencyInjection/RapsysPackExtension.php
+++ b/DependencyInjection/RapsysPackExtension.php
@@ -17,14 +17,20 @@ 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);

        }
 
        }
 

+       /**
+        * {@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/');
        }
 }