geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

added a test for the raw tag

Browse Source
This commit is contained in:
Fabien Potencier
2011-05-09 17:47:21 +02:00
parent 64ce3e0e62
commit 48f427ebd3
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Lexer.php
+12 -7
View File
@@ -160,13 +160,7 @@ class Twig_Lexer implements Twig_LexerInterface
// raw data?
if (preg_match('/\s*raw\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
if (!preg_match('/'.preg_quote($this->options['tag_block'][0], '/').'\s*endraw\s*'.preg_quote($this->options['tag_block'][1], '/').'/s', $this->code, $match, null, $this->cursor)) {
throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'));
}
$pos = strpos($this->code, $match[0], $this->cursor);
$text = substr($this->code, $this->cursor, $pos - $this->cursor);
$this->pushToken(Twig_Token::TEXT_TYPE, $text);
$this->moveCursor($text.$match[0]);
$this->lexRawData();
$this->state = self::STATE_DATA;
} else {
$this->pushToken(Twig_Token::BLOCK_START_TYPE);
@@ -267,6 +261,17 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
protected function lexRawData()
{
if (!preg_match('/'.preg_quote($this->options['tag_block'][0], '/').'\s*endraw\s*'.preg_quote($this->options['tag_block'][1], '/').'/s', $this->code, $match, null, $this->cursor)) {
throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'));
}
$pos = strpos($this->code, $match[0], $this->cursor);
$text = substr($this->code, $this->cursor, $pos - $this->cursor);
$this->pushToken(Twig_Token::TEXT_TYPE, $text);
$this->moveCursor($text.$match[0]);
}
protected function pushToken($type, $value = '')
{
// do not push empty text tokens
test/Twig/Tests/Fixtures/tags/raw/basic.test
+10
View File
@@ -0,0 +1,10 @@
--TEST--
"raw" tag
--TEMPLATE--
{% raw %}
{{ foo }}
{% endraw %}
--DATA--
return array()
--EXPECT--
{{ foo }}