X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/85954eeea034b2904c5bc8bcfa710349702f02bf..cbc3bd63598757f86f123fa6afb1b26e8e42ae70:/DependencyInjection/Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1ea8231..faca79f 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();
+		$treeBuilder = new TreeBuilder('rapsys_pack');
 
 		//Get ExecutableFinder object
 		$finder = new ExecutableFinder();
@@ -48,9 +51,10 @@ 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',
+				'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.1.1',
 				'redirect' => 5
 			],
 			'output' => [
@@ -58,15 +62,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' => []
 				],
 			]
 		];
@@ -74,55 +87,84 @@ class Configuration implements ConfigurationInterface {
 		//Here we define the parameters that are allowed to configure the bundle.
 		$treeBuilder
 			//Parameters
-			->root('parameters')
-				->isRequired()
+			->getRootNode()
+				#->cannotBeEmpty()
 				->addDefaultsIfNotSet()
 				->children()
-					->arrayNode('rapsys_pack')
-						->isRequired()
+					->arrayNode('config')
 						->addDefaultsIfNotSet()
 						->children()
-							->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()
+							->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('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()
+							->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()
+										->arrayNode('args')
+											->treatNullLike(array())
+											->defaultValue($defaults['filters']['js']['args'])
+											->scalarPrototype()->end()
+										->end()
+									->end()
 								->end()
 							->end()
-							->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'])
+							->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()
 							->end()