From: Raphaƫl Gertz Date: Thu, 7 Nov 2019 01:43:16 +0000 (+0100) Subject: Move the configuration in rapsys_pack key X-Git-Tag: 0.1.1~2 X-Git-Url: https://git.rapsys.eu/packbundle/commitdiff_plain/63f158466030cd436f11864e5494885a4f3ba11d?ds=sidebyside Move the configuration in rapsys_pack key Enforce smart requirements Cleanup --- diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index bfa4b3c..dde458d 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -12,6 +12,9 @@ use Symfony\Component\Process\ExecutableFinder; * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html} */ class Configuration implements ConfigurationInterface { + //The project dir + private $projectDir; + //Constructor required to derivate prefix from kernel.project_dir public function __construct($projectDir) { $this->projectDir = $projectDir; @@ -22,7 +25,7 @@ class Configuration implements ConfigurationInterface { */ public function getConfigTreeBuilder() { //Get TreeBuilder object - $treeBuilder = new TreeBuilder('parameters'); + $treeBuilder = new TreeBuilder('rapsys_pack'); //Get ExecutableFinder object $finder = new ExecutableFinder(); @@ -85,88 +88,82 @@ class Configuration implements ConfigurationInterface { $treeBuilder //Parameters ->getRootNode() + #->cannotBeEmpty() ->addDefaultsIfNotSet() ->children() - ->arrayNode('rapsys_pack') + ->arrayNode('config') ->addDefaultsIfNotSet() ->children() - ->arrayNode('config') - ->isRequired() - ->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() - ->integerNode('redirect')->isRequired()->min(1)->defaultValue($defaults['config']['redirect'])->end() - ->end() - ->end() - ->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() + ->scalarNode('prefix')->cannotBeEmpty()->defaultValue($defaults['config']['prefix'])->end() + ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['config']['name'])->end() + ->scalarNode('scheme')->cannotBeEmpty()->defaultValue($defaults['config']['scheme'])->end() + ->integerNode('timeout')->min(0)->max(300)->defaultValue($defaults['config']['timeout'])->end() + ->scalarNode('agent')->cannotBeEmpty()->defaultValue($defaults['config']['agent'])->end() + ->integerNode('redirect')->min(1)->max(30)->defaultValue($defaults['config']['redirect'])->end() + ->end() + ->end() + ->arrayNode('output') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('css')->cannotBeEmpty()->defaultValue($defaults['output']['css'])->end() + ->scalarNode('js')->cannotBeEmpty()->defaultValue($defaults['output']['js'])->end() + ->scalarNode('img')->cannotBeEmpty()->defaultValue($defaults['output']['img'])->end() + ->end() + ->end() + ->arrayNode('filters') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('css') + #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513 + ->addDefaultChildrenIfNoneSet() + ->arrayPrototype() + ->children() + ->scalarNode('class') + ->isRequired() + ->cannotBeEmpty() + ->defaultValue($defaults['filters']['css']['class']) + ->end() + ->arrayNode('args') + /*->isRequired()*/ + ->treatNullLike(array()) + ->defaultValue($defaults['filters']['css']['args']) + ->scalarPrototype()->end() + ->end() + ->end() ->end() ->end() - ->arrayNode('filters') - ->isRequired() - ->addDefaultsIfNotSet() - ->children() - ->arrayNode('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() + ->arrayNode('js') + #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513 + ->addDefaultChildrenIfNoneSet() + ->arrayPrototype() + ->children() + ->scalarNode('class') + ->isRequired() + ->cannotBeEmpty() + ->defaultValue($defaults['filters']['js']['class']) ->end() - ->end() - ->arrayNode('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() + ->arrayNode('args') + ->treatNullLike(array()) + ->defaultValue($defaults['filters']['js']['args']) + ->scalarPrototype()->end() ->end() ->end() - ->arrayNode('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() + ->arrayNode('img') + #XXX: undocumented, see Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +513 + ->addDefaultChildrenIfNoneSet() + ->arrayPrototype() + ->children() + ->scalarNode('class') + ->isRequired() + ->cannotBeEmpty() + ->defaultValue($defaults['filters']['img']['class']) + ->end() + ->arrayNode('args') + ->treatNullLike(array()) + ->defaultValue($defaults['filters']['img']['args']) + ->scalarPrototype()->end() ->end() ->end() ->end()