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

Merge pull request #118 from JustBlackBird/fix_slashes

Browse Source 
Fix slashes mess in Tokenizer
This commit is contained in:
fzerorubigd 2015-06-02 12:10:53 +04:30
commit 8f9d0e5fef
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Handlebars/Tokenizer.php
View File

@ -136,7 +136,6 @@ class Tokenizer
*/ */
$len = strlen($text); $len = strlen($text);
for ($i = 0; $i < $len; $i++) { for ($i = 0; $i < $len; $i++) {
$this->escaping = $this->tagChange(self::T_ESCAPE, $text, $i); $this->escaping = $this->tagChange(self::T_ESCAPE, $text, $i);
// To play nice with helpers' arguments quote and apostrophe marks // To play nice with helpers' arguments quote and apostrophe marks
@ -144,13 +143,21 @@ class Tokenizer
$quoteInTag = $this->state != self::IN_TEXT $quoteInTag = $this->state != self::IN_TEXT
&& ($text[$i] == self::T_SINGLE_Q || $text[$i] == self::T_DOUBLE_Q); && ($text[$i] == self::T_SINGLE_Q || $text[$i] == self::T_DOUBLE_Q);
if ($this->escaped && $text[$i] != self::T_UNESCAPED && !$quoteInTag) { if ($this->escaped && !$this->tagChange($this->otag, $text, $i) && !$quoteInTag) {
$this->buffer .= "\\"; $this->buffer .= "\\";
} }
switch ($this->state) { switch ($this->state) {
case self::IN_TEXT: case self::IN_TEXT:
if ($this->tagChange($this->otag. self::T_TRIM, $text, $i) and !$this->escaped) { // Handlebars.js does not think that openning curly brace in
// "\\\{{data}}" template is escaped. Instead it removes one
// slash and leaves others "as is". To emulate similar behavior
// we have to check the last character in the buffer. If it's a
// slash we actually does not need to escape openning curly
// brace.
$prev_slash = substr($this->buffer, -1) == '\\';
if ($this->tagChange($this->otag. self::T_TRIM, $text, $i) and (!$this->escaped || $prev_slash)) {
$this->flushBuffer(); $this->flushBuffer();
$this->state = self::IN_TAG_TYPE; $this->state = self::IN_TAG_TYPE;
$this->trimLeft = true; $this->trimLeft = true;
@ -158,12 +165,16 @@ class Tokenizer
$this->buffer .= "{{{"; $this->buffer .= "{{{";
$i += 2; $i += 2;
continue; continue;
} elseif ($this->tagChange($this->otag, $text, $i) and !$this->escaped) { } elseif ($this->tagChange($this->otag, $text, $i) and (!$this->escaped || $prev_slash)) {
$i--; $i--;
$this->flushBuffer(); $this->flushBuffer();
$this->state = self::IN_TAG_TYPE; $this->state = self::IN_TAG_TYPE;
} elseif ($this->escaped and $this->escaping) { } elseif ($this->escaped and $this->escaping) {
$this->buffer .= "\\"; // We should not add extra slash before opening tag because
// doubled slash where should be transformed to single one
if (($i + 1) < $len && !$this->tagChange($this->otag, $text, $i + 1)) {
$this->buffer .= "\\";
}
} elseif (!$this->escaping) { } elseif (!$this->escaping) {
if ($text[$i] == "\n") { if ($text[$i] == "\n") {
$this->filterLine(); $this->filterLine();

31
tests/Xamin/HandlebarsTest.php
View File

@ -118,32 +118,47 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
'<strong>Test</strong>' '<strong>Test</strong>'
), ),
array( array(
"\{{data}}", // is equal to \\{{data}} "\\{{data}}", // is equal to \{{data}} in template file
array('data' => 'foo'), array('data' => 'foo'),
'{{data}}', '{{data}}',
), ),
array( array(
'\\\\{{data}}', '\\\\{{data}}', // is equal to \\{{data}} in template file
array('data' => 'foo'), array('data' => 'foo'),
'\\\\foo' '\\foo' // is equals to \foo in output
), ),
array( array(
'\\\{{data}}', // is equal to \\\\{{data}} in php '\\\\\\{{data}}', // is equal to \\\{{data}} in template file
array('data' => 'foo'), array('data' => 'foo'),
'\\\\foo' '\\\\foo' // is equals to \\foo in output
), ),
array( array(
'\{{{data}}}', '\\\\\\\\{{data}}', // is equal to \\\\{{data}} in template file
array('data' => 'foo'),
'\\\\\\foo' // is equals to \\\foo in output
),
array(
'\{{{data}}}', // is equal to \{{{data}}} in template file
array('data' => 'foo'), array('data' => 'foo'),
'{{{data}}}' '{{{data}}}'
), ),
array( array(
'\pi', '\pi', // is equal to \pi in template
array(), array(),
'\pi' '\pi'
), ),
array( array(
'\\\\\\\\qux', '\\\\foo', // is equal to \\foo in template
array(),
'\\\\foo'
),
array(
'\\\\\\bar', // is equal to \\\bar in template
array(),
'\\\\\\bar'
),
array(
'\\\\\\\\qux', // is equal to \\\\qux in template file
array(), array(),
'\\\\\\\\qux' '\\\\\\\\qux'
), ),