makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Use Twig mask for IF statements instead of our own tokenparser

Browse source 
PHPBB3-11598
This commit is contained in:
Nathan Guse 2013-07-05 14:10:57 -05:00
parent 0ffbdc80d1
commit 8d11a147f5
3 changed files with 6 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/template/twig/extension.php
View file

@ -54,7 +54,6 @@ class phpbb_template_twig_extension extends Twig_Extension
public function getTokenParsers()
{
return array(
new phpbb_template_twig_tokenparser_if,
new phpbb_template_twig_tokenparser_define,
new phpbb_template_twig_tokenparser_include,
new phpbb_template_twig_tokenparser_includejs,

8
phpBB/includes/template/twig/lexer.php
View file

@ -24,12 +24,12 @@ class phpbb_template_twig_lexer extends Twig_Lexer
$phpbb_tags = array(
/*'BEGIN',
'BEGINELSE',
'END',*/
'END',
'IF',
'ELSE',
'ELSEIF',
'ENDIF',
/*'DEFINE',
'DEFINE',
'UNDEFINE',*/
'ENDDEFINE',
'INCLUDE',
@ -44,6 +44,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
$twig_tags = array(
'autoescape',
'endautoescape',
'if',
'elseif',
'else',
'endif',
'block',
'endblock',
'use',

87
phpBB/includes/template/twig/tokenparser/if.php
View file

@ -1,87 +0,0 @@
<?php
/**
*
* @package phpBB3
* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
{
/**
* Parses a token and returns a node.
*
* @param Twig_Token $token A Twig_Token instance
*
* @return Twig_NodeInterface A Twig_NodeInterface instance
*/
public function parse(Twig_Token $token)
{
$lineno = $token->getLine();
$expr = $this->parser->getExpressionParser()->parseExpression();
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideIfFork'));
$tests = array($expr, $body);
$else = null;
$end = false;
while (!$end) {
switch ($stream->next()->getValue()) {
case 'ELSE':
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$else = $this->parser->subparse(array($this, 'decideIfEnd'));
break;
case 'ELSEIF':
$expr = $this->parser->getExpressionParser()->parseExpression();
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideIfFork'));
$tests[] = $expr;
$tests[] = $body;
break;
case 'ENDIF':
$end = true;
break;
default:
throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "ELSE", "ELSEIF", or "ENDIF" to close the "IF" block started at line %d)', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
}
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
}
public function decideIfFork(Twig_Token $token)
{
return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
}
public function decideIfEnd(Twig_Token $token)
{
return $token->test(array('ENDIF'));
}
/**
* Gets the tag name associated with this token parser.
*
* @return string The tag name
*/
public function getTag()
{
return 'IF';
}
}