Fix filters structure

[packbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1ea8231b43f7cb71c996118f1e6320d99bf9975a..5456a29d0ccf02b56b7450e356c9aaf9cc29561e 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -48,6 +48,7 @@ class Configuration implements ConfigurationInterface {
                $defaults = [
                        'config' => [
                                'prefix' => $this->projectDir,
+                               'name' => 'asset_url',
                                'scheme' => 'https://',
                                'timeout' => (int)ini_get('default_socket_timeout'),
                                'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.0.2',
@@ -58,15 +59,24 @@ class Configuration implements ConfigurationInterface {
                                'js' => 'js/*.pack.js',
                                'img' => 'img/*.pack.jpg'
                        ],
-                       'filter' => [
+                       'filters' => [
                                'css' => [
-                                       'Rapsys\PackBundle\Twig\Filter\CPackFilter' => [$finder->find('cpack', '/usr/local/bin/cpack')]
+                                       'class' => 'Rapsys\PackBundle\Twig\Filter\CPackFilter',
+                                       'args' => [
+                                               $finder->find('cpack', '/usr/local/bin/cpack'),
+                                               'minify'
+                                       ]
                                ],
                                'js' => [
-                                       'Rapsys\PackBundle\Twig\Filter\JPackFilter' => [$finder->find('jpack', '/usr/local/bin/jpack')]
+                                       'class' => 'Rapsys\PackBundle\Twig\Filter\JPackFilter',
+                                       'args' => [
+                                               $finder->find('jpack', '/usr/local/bin/jpack'),
+                                               'best'
+                                       ]
                                ],
                                'img' => [
-                                       'Rapsys\PackBundle\Twig\Filter\IPackFilter' => []
+                                       'class' => 'Rapsys\PackBundle\Twig\Filter\IPackFilter',
+                                       'args' => []
                                ],
                        ]
                ];
@@ -75,11 +85,9 @@ class Configuration implements ConfigurationInterface {
                $treeBuilder
                        //Parameters
                        ->root('parameters')
-                               ->isRequired()
                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('rapsys_pack')
-                                               ->isRequired()
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('config')
@@ -87,6 +95,7 @@ class Configuration implements ConfigurationInterface {
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                        ->scalarNode('prefix')->isRequired()->defaultValue($defaults['config']['prefix'])->end()
+                                                                       ->scalarNode('name')->isRequired()->defaultValue($defaults['config']['name'])->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()
@@ -102,27 +111,63 @@ class Configuration implements ConfigurationInterface {
                                                                        ->scalarNode('img')->isRequired()->defaultValue($defaults['output']['img'])->end()
                                                                ->end()
                                                        ->end()
-                                                       ->arrayNode('filter')
+                                                       ->arrayNode('filters')
                                                                ->isRequired()
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                        ->arrayNode('css')
-                                                                               ->isRequired()
-                                                                               ->treatNullLike(array())
-                                                                               ->scalarPrototype()->end()
-                                                                               ->defaultValue($defaults['filter']['css'])
+                                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                               ->addDefaultChildrenIfNoneSet()
+                                                                               ->arrayPrototype()
+                                                                                       ->children()
+                                                                                               ->scalarNode('class')
+                                                                                                       ->isRequired()
+                                                                                                       ->defaultValue($defaults['filters']['css']['class'])
+                                                                                               ->end()
+                                                                                               ->arrayNode('args')
+                                                                                                       ->isRequired()
+                                                                                                       ->treatNullLike(array())
+                                                                                                       ->defaultValue($defaults['filters']['css']['args'])
+                                                                                                       ->scalarPrototype()->end()
+                                                                                               ->end()
+                                                                                       ->end()
+                                                                               ->end()
                                                                        ->end()
                                                                        ->arrayNode('js')
-                                                                               ->isRequired()
-                                                                               ->treatNullLike(array())
-                                                                               ->scalarPrototype()->end()
-                                                                               ->defaultValue($defaults['filter']['js'])
+                                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                               ->addDefaultChildrenIfNoneSet()
+                                                                               ->arrayPrototype()
+                                                                                       ->children()
+                                                                                               ->scalarNode('class')
+                                                                                                       ->isRequired()
+                                                                                                       ->defaultValue($defaults['filters']['js']['class'])
+                                                                                               ->end()
+                                                                                               ->arrayNode('args')
+                                                                                                       ->isRequired()
+                                                                                                       ->treatNullLike(array())
+                                                                                                       ->defaultValue($defaults['filters']['js']['args'])
+                                                                                                       ->scalarPrototype()->end()
+                                                                                               ->end()
+                                                                                       ->end()
+                                                                               ->end()
                                                                        ->end()
                                                                        ->arrayNode('img')
-                                                                               ->isRequired()
-                                                                               ->treatNullLike(array())
-                                                                               ->scalarPrototype()->end()
-                                                                               ->defaultValue($defaults['filter']['img'])
+                                                                               #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513
+                                                                               ->addDefaultChildrenIfNoneSet()
+                                                                               ->arrayPrototype()
+                                                                                       ->children()
+                                                                                               ->scalarNode('class')
+                                                                                                       ->isRequired()
+                                                                                                       ->defaultValue($defaults['filters']['img']['class'])
+                                                                                               ->end()
+                                                                                               ->arrayNode('args')
+                                                                                                       ->isRequired()
+                                                                                                       ->treatNullLike(array())
+                                                                                                       ->defaultValue($defaults['filters']['img']['args'])
+                                                                                                       ->scalarPrototype()->end()
+                                                                                               ->end()
+                                                                                       ->end()
+                                                                               ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()