mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig

Browse Source 
Fixing begin token/node, adding includejs token/node

PHPBB3-11598
This commit is contained in:
Nathan Guse
2013-06-10 11:17:11 -05:00
parent b775f67128
commit 15114067e6
6 changed files with 146 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/template/twig/tokenparser/begin.php
View File

@@ -37,7 +37,7 @@ class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideBeginFork'));
if ($this->parser->getStream()->next()->getValue() == 'ELSE') {
if ($this->parser->getStream()->next()->getValue() == 'BEGINELSE') {
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
$else = $this->parser->subparse(array($this, 'decideBeginEnd'), true);
} else {
@@ -54,7 +54,7 @@ class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
return $token->test(array('BEGINELSE', 'END'));
}
public function decideForEnd(Twig_Token $token)
public function decideBeginEnd(Twig_Token $token)
{
return $token->test('END');
}

49
phpBB/includes/template/twig/tokenparser/includejs.php Normal file
View File

@@ -0,0 +1,49 @@
<?php
/*
* This file is part of Twig.
*
* (c) 2009 Fabien Potencier
* (c) 2009 Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
* Includes a template.
*
* <pre>
* {% include 'header.html' %}
* Body
* {% include 'footer.html' %}
* </pre>
*/
class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_Include
{
/**
* 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)
{
$expr = $this->parser->getExpressionParser()->parseExpression();
list($variables, $only, $ignoreMissing) = $this->parseArguments();
return new phpbb_template_twig_node_includejs($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
}
/**
* Gets the tag name associated with this token parser.
*
* @return string The tag name
*/
public function getTag()
{
return 'INCLUDEJS';
}
}