X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/ce4ef48d51a312fa5f854e91f3825a699d9325e8..b69214e3aa8c18b333a58b160aa22fa2c356065f:/DependencyInjection/Configuration.php?ds=sidebyside

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 7217e98..ebbdbfd 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -13,6 +13,7 @@ namespace Rapsys\PackBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Process\ExecutableFinder;
 
 use Rapsys\PackBundle\RapsysPackBundle;
@@ -30,25 +31,13 @@ class Configuration implements ConfigurationInterface {
 	 */
 	public function getConfigTreeBuilder(): TreeBuilder {
 		//Get TreeBuilder object
-		$treeBuilder = new TreeBuilder(RapsysPackBundle::getAlias());
+		$treeBuilder = new TreeBuilder($alias = RapsysPackBundle::getAlias());
 
 		//Get ExecutableFinder object
 		$finder = new ExecutableFinder();
 
 		//The bundle default values
 		$defaults = [
-			'config' => [
-				'name' => 'asset_url',
-				'scheme' => 'https://',
-				'timeout' => (int)ini_get('default_socket_timeout'),
-				'agent' => (string)ini_get('user_agent')?:'rapsys_pack/0.2.0',
-				'redirect' => 5
-			],
-			'output' => [
-				'css' => '@RapsysPack/css/*.pack.css',
-				'js' =>  '@RapsysPack/js/*.pack.js',
-				'img' => '@RapsysPack/img/*.pack.jpg'
-			],
 			'filters' => [
 				'css' => [
 					0 => [
@@ -59,6 +48,12 @@ class Configuration implements ConfigurationInterface {
 						]
 					]
 				],
+				'img' => [
+					0 => [
+						'class' => 'Rapsys\PackBundle\Filter\IPackFilter',
+						'args' => []
+					]
+				],
 				'js' => [
 					0 => [
 						'class' => 'Rapsys\PackBundle\Filter\JPackFilter',
@@ -67,14 +62,17 @@ class Configuration implements ConfigurationInterface {
 							'best'
 						]
 					]
-				],
-				'img' => [
-					0 => [
-						'class' => 'Rapsys\PackBundle\Filter\IPackFilter',
-						'args' => []
-					]
-				],
-			]
+				]
+			],
+			#TODO: migrate to public.path, public.url and router->generateUrl ?
+			#XXX: that would means dropping the PathPackage stuff and use static route like rapsys_pack_facebook
+			'output' => [
+				'css' => '@RapsysPack/css/*.pack.css',
+				'img' => '@RapsysPack/img/*.pack.jpg',
+				'js' =>  '@RapsysPack/js/*.pack.js'
+			],
+			'path' => dirname(__DIR__).'/Resources/public',
+			'token' => 'asset_url'
 		];
 
 		/**
@@ -92,24 +90,6 @@ class Configuration implements ConfigurationInterface {
 			->getRootNode()
 				->addDefaultsIfNotSet()
 				->children()
-					->arrayNode('config')
-						->addDefaultsIfNotSet()
-						->children()
-							->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()
@@ -136,7 +116,7 @@ class Configuration implements ConfigurationInterface {
 									->end()
 								->end()
 							->end()
-							->arrayNode('js')
+							->arrayNode('img')
 								/**
 								 * Undocumented
 								 *
@@ -148,17 +128,17 @@ class Configuration implements ConfigurationInterface {
 										->scalarNode('class')
 											->isRequired()
 											->cannotBeEmpty()
-											->defaultValue($defaults['filters']['js'][0]['class'])
+											->defaultValue($defaults['filters']['img'][0]['class'])
 										->end()
 										->arrayNode('args')
 											->treatNullLike([])
-											->defaultValue($defaults['filters']['js'][0]['args'])
+											->defaultValue($defaults['filters']['img'][0]['args'])
 											->scalarPrototype()->end()
 										->end()
 									->end()
 								->end()
 							->end()
-							->arrayNode('img')
+							->arrayNode('js')
 								/**
 								 * Undocumented
 								 *
@@ -170,11 +150,11 @@ class Configuration implements ConfigurationInterface {
 										->scalarNode('class')
 											->isRequired()
 											->cannotBeEmpty()
-											->defaultValue($defaults['filters']['img'][0]['class'])
+											->defaultValue($defaults['filters']['js'][0]['class'])
 										->end()
 										->arrayNode('args')
 											->treatNullLike([])
-											->defaultValue($defaults['filters']['img'][0]['args'])
+											->defaultValue($defaults['filters']['js'][0]['args'])
 											->scalarPrototype()->end()
 										->end()
 									->end()
@@ -182,6 +162,16 @@ class Configuration implements ConfigurationInterface {
 							->end()
 						->end()
 					->end()
+					->arrayNode('output')
+						->addDefaultsIfNotSet()
+						->children()
+							->scalarNode('css')->cannotBeEmpty()->defaultValue($defaults['output']['css'])->end()
+							->scalarNode('img')->cannotBeEmpty()->defaultValue($defaults['output']['img'])->end()
+							->scalarNode('js')->cannotBeEmpty()->defaultValue($defaults['output']['js'])->end()
+						->end()
+					->end()
+					->scalarNode('path')->cannotBeEmpty()->defaultValue($defaults['path'])->end()
+					->scalarNode('token')->cannotBeEmpty()->defaultValue($defaults['token'])->end()
 				->end()
 			->end();