Mibew/handlebars.php
1
0
Fork 0
mirror of https://github.com/Mibew/handlebars.php.git synced 2025-04-07 16:00:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented proper treatment of brackets inside string arguments in subexpressions ( {{foo '(bar)'}} )

Browse Source
This commit is contained in:
majortom731 2014-03-17 23:01:30 +01:00
parent 5a58d27ad3
commit ffcbecf346
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Handlebars/Template.php
View File

@ -275,17 +275,30 @@ class Template
// subexpression parsing loop // subexpression parsing loop
$subexprs = array(); // will contain all subexpressions inside outermost brackets $subexprs = array(); // will contain all subexpressions inside outermost brackets
$inside_of = array( 'single' => false, 'double' => false );
$lvl = 0; $lvl = 0;
$cur_start = 0; $cur_start = 0;
for ($i=0; $i < strlen($params[2]); $i++) { for ($i=0; $i < strlen($params[2]); $i++) {
$cur = substr($params[2], $i, 1); $cur = substr($params[2], $i, 1);
if ($cur == '(') { if ($cur == "'" ) {
if( $lvl == 0 ) $cur_start = $i+1; $inside_of['single'] = ! $inside_of['single'];
$lvl++;
} }
if ($cur == ')') { if ($cur == '"' ) {
$inside_of['double'] = ! $inside_of['double'];
}
if ($cur == '(' && ! $inside_of['single'] && ! $inside_of['double']) {
if ($lvl == 0) {
$cur_start = $i+1;
}
$lvl++;
continue;
}
if ($cur == ')' && ! $inside_of['single'] && ! $inside_of['double']) {
$lvl--; $lvl--;
if ($lvl == 0) $subexprs[] = substr($params[2], $cur_start, $i - $cur_start); if ($lvl == 0) {
$subexprs[] = substr($params[2], $cur_start, $i - $cur_start);
}
} }
} }
@ -300,7 +313,7 @@ class Template
Tokenizer::OTAG => $current[Tokenizer::OTAG], Tokenizer::OTAG => $current[Tokenizer::OTAG],
Tokenizer::CTAG => $current[Tokenizer::CTAG], Tokenizer::CTAG => $current[Tokenizer::CTAG],
Tokenizer::INDEX => $current[Tokenizer::INDEX], Tokenizer::INDEX => $current[Tokenizer::INDEX],
Tokenizer::ARGS => implode(" ", array_slice( $cmd, 1 )) Tokenizer::ARGS => implode(" ", array_slice($cmd, 1))
); );
// resolve the node recursively // resolve the node recursively
$resolved = $this->_handlebarsStyleSection($context, $section_node); $resolved = $this->_handlebarsStyleSection($context, $section_node);