Fixes fuel#32 - numerical indexed config arrays aren't mergeable, now…

… all associative.
ounziw · Mar 18, 2012 · 91fbb11 · 91fbb11
1 parent 23a13fb
commit 91fbb11
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/classes/view/dwoo.php b/classes/view/dwoo.php
@@ -67,8 +67,8 @@ public static function parser()
 		static::$_parser_compiler->setLooseOpeningHandling(\Config::get('parser.View_Dwoo.environment.allow_spaces', false));
 		static::$_parser_compiler->setNestedCommentsHandling(\Config::get('parser.View_Dwoo.environment.nested_comments', false));
 		static::$_parser_compiler->setDelimiters(
-			\Config::get('parser.View_Dwoo.delimiters.0', '{'),
-			\Config::get('parser.View_Dwoo.delimiters.1', '}')
+			\Config::get('parser.View_Dwoo.delimiters.left', '{'),
+			\Config::get('parser.View_Dwoo.delimiters.right', '}')
 		);
 
 		// Security

diff --git a/classes/view/mustache.php b/classes/view/mustache.php
@@ -52,7 +52,7 @@ public static function parser()
 		}
 
 		$options = array(
-			'delimiters'  => \Config::get('parser.View_Mustache.delimiters', array('{{','}}')),
+			'delimiters'  => array_keys(\Config::get('parser.View_Mustache.delimiters', array('{{','}}'))),
 			'charset'     => \Config::get('parser.View_Mustache.environment.charset', 'UTF-8'),
 			'pragmas'     => \Config::get('parser.View_Mustache.environment.pragmas', array()),
 		);

diff --git a/classes/view/smarty.php b/classes/view/smarty.php
@@ -66,8 +66,8 @@ public static function parser()
 		static::$_parser->compile_check     = \Config::get('parser.View_Smarty.environment.compile_check', true);
 		static::$_parser->debugging         = \Config::get('parser.View_Smarty.environment.debugging', false);
 
-		static::$_parser->left_delimiter    = \Config::get('parser.View_Smarty.delimiters.0', '{');
-		static::$_parser->right_delimiter   = \Config::get('parser.View_Smarty.delimiters.1', '}');
+		static::$_parser->left_delimiter    = \Config::get('parser.View_Smarty.delimiters.left', '{');
+		static::$_parser->right_delimiter   = \Config::get('parser.View_Smarty.delimiters.right', '}');
 
 		static::$_parser->autoload_filters  = \Config::get('parser.View_Smarty.environment.autoload_filters', array());
 		static::$_parser->default_modifiers = \Config::get('parser.View_Smarty.environment.default_modifiers', array());

diff --git a/classes/view/twig.php b/classes/view/twig.php
@@ -83,6 +83,13 @@ public static function parser()
 		$twig_lexer_conf = \Config::get('parser.View_Twig.delimiters', null);
 		if (isset($twig_lexer_conf))
 		{
+			isset($twig_lexer_conf['tag_block'])
+				and $twig_lexer_conf['tag_block'] = array_keys($twig_lexer_conf['tag_block']);
+			isset($twig_lexer_conf['tag_comment'])
+				and $twig_lexer_conf['tag_comment'] = array_keys($twig_lexer_conf['tag_comment']);
+			isset($twig_lexer_conf['tag_variable'])
+				and $twig_lexer_conf['tag_variable'] = array_keys($twig_lexer_conf['tag_variable']);
+
 			$twig_lexer = new Twig_Lexer(static::$_parser, $twig_lexer_conf);
 			static::$_parser->setLexer($twig_lexer);
 		}

diff --git a/config/parser.php b/config/parser.php
@@ -56,9 +56,9 @@
 		'auto_encode' => true,
 		'views_paths' => array(APPPATH.'views'),
 		'delimiters' => array(
-			'tag_block'     => array('{%', '%}'),
-			'tag_comment'   => array('{#', '#}'),
-			'tag_variable'  => array('{{', '}}'),
+			'tag_block'     => array('left' => '{%', 'right' => '%}'),
+			'tag_comment'   => array('left' => '{#', 'right' => '#}'),
+			'tag_variable'  => array('left' => '{{', 'right' => '}}'),
 		),
 		'environment' => array(
 			'debug'                => false,
@@ -80,7 +80,7 @@
 	'View_Dwoo' => array(
 		'include' => APPPATH.'vendor'.DS.'Dwoo'.DS.'dwooAutoload.php',
 		'auto_encode' => true,
-		'delimiters' => array('{{', '}}'),
+		'delimiters' => array('left' => '{{', 'right' => '}}'),
 		'environment' => array(
 			'autoescape'       => false,
 			'nested_comments'  => false,
@@ -103,7 +103,7 @@
 	'View_Mustache' => array(
 		'include' => PKGPATH.'parser'.DS.'vendor'.DS.'Mustache'.DS.'Mustache.php',
 		'auto_encode' => true,
-		'delimiters' => array('{{', '}}'),
+		'delimiters' => array('left' => '{{', 'right' => '}}'),
 		'environment' => array(
 			'charset' => 'UTF-8',
 			'pragmas' => array(),
@@ -132,7 +132,7 @@
 	'View_Smarty'   => array(
 		'include'       => APPPATH.'vendor'.DS.'Smarty'.DS.'libs'.DS.'Smarty.class.php',
 		'auto_encode' => true,
-		'delimiters'    => array('{', '}'),
+		'delimiters'    => array('left' => '{', 'right' => '}'),
 		'environment'   => array(
 			'compile_dir'       => APPPATH.'tmp'.DS.'Smarty'.DS.'templates_c'.DS,
 			'config_dir'        => APPPATH.'tmp'.DS.'Smarty'.DS.'configs'.DS,