aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template/twig
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/template/twig')
-rw-r--r--phpBB/includes/template/twig/environment.php11
-rw-r--r--phpBB/includes/template/twig/node/define.php26
-rw-r--r--phpBB/includes/template/twig/node/event.php66
-rw-r--r--phpBB/includes/template/twig/node/expression/binary/equalequal.php8
-rw-r--r--phpBB/includes/template/twig/node/expression/binary/notequalequal.php8
-rw-r--r--phpBB/includes/template/twig/node/include.php28
-rw-r--r--phpBB/includes/template/twig/node/includejs.php36
-rw-r--r--phpBB/includes/template/twig/node/includephp.php60
-rw-r--r--phpBB/includes/template/twig/node/php.php32
-rw-r--r--phpBB/includes/template/twig/tokenparser/define.php90
-rw-r--r--phpBB/includes/template/twig/tokenparser/event.php46
-rw-r--r--phpBB/includes/template/twig/tokenparser/if.php114
-rw-r--r--phpBB/includes/template/twig/tokenparser/include.php44
-rw-r--r--phpBB/includes/template/twig/tokenparser/includejs.php46
-rw-r--r--phpBB/includes/template/twig/tokenparser/includephp.php58
-rw-r--r--phpBB/includes/template/twig/tokenparser/php.php52
16 files changed, 368 insertions, 357 deletions
diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 190d43f513..acb97cfad2 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -29,6 +29,15 @@ class phpbb_template_twig_environment extends Twig_Environment
/** @var array **/
protected $namespace_look_up_order = array('__main__');
+ /**
+ * Constructor
+ *
+ * @param phpbb_config $phpbb_config
+ * @param array $phpbb_extensions Array of enabled extensions (name => path)
+ * @param string $phpbb_root_path
+ * @param Twig_LoaderInterface $loader
+ * @param array $options Array of options to pass to Twig
+ */
public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
{
$this->phpbb_config = $phpbb_config;
@@ -41,6 +50,8 @@ class phpbb_template_twig_environment extends Twig_Environment
/**
* Get the list of enabled phpBB extensions
*
+ * Used in EVENT node
+ *
* @return array
*/
public function get_phpbb_extensions()
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
index 0c4d400767..499bbdc518 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/includes/template/twig/node/define.php
@@ -9,19 +9,19 @@
class phpbb_template_twig_node_define extends Twig_Node
{
- public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
- {
- parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
- }
+ public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
+ {
+ parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
+ }
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
if ($this->getAttribute('capture')) {
$compiler
@@ -45,5 +45,5 @@ class phpbb_template_twig_node_define extends Twig_Node
->raw($this->getNode('name')->getAttribute('name'))
->raw("', \$value);\n")
;
- }
+ }
}
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index 358c68dae5..6de270e19c 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -12,39 +12,39 @@ class phpbb_template_twig_node_event extends Twig_Node
/** @var Twig_Environment */
protected $environment;
- public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
- {
- $this->environment = $environment;
-
- parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
- }
-
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
-
- $location = $this->getNode('expr')->getAttribute('name');
-
- foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
- {
- $ext_namespace = str_replace('/', '_', $ext_namespace);
-
- if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
- {
- $compiler
- ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
-
- // We set the namespace lookup order to be this extension first, then the main path
- ->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
- ->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
- ->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
- ;
+ public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+ {
+ $this->environment = $environment;
+
+ parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+ }
+
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
+
+ $location = $this->getNode('expr')->getAttribute('name');
+
+ foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
+ {
+ $ext_namespace = str_replace('/', '_', $ext_namespace);
+
+ if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+ {
+ $compiler
+ ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+ // We set the namespace lookup order to be this extension first, then the main path
+ ->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
+ ->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
+ ->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+ ;
}
}
- }
+ }
}
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
index 3a0c79c839..054f63ecf9 100644
--- a/phpBB/includes/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
@@ -9,8 +9,8 @@
class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
{
- public function operator(Twig_Compiler $compiler)
- {
- return $compiler->raw('===');
- }
+ public function operator(Twig_Compiler $compiler)
+ {
+ return $compiler->raw('===');
+ }
}
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
index b53bc56b2d..d8a1c411cf 100644
--- a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
@@ -9,8 +9,8 @@
class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
{
- public function operator(Twig_Compiler $compiler)
- {
- return $compiler->raw('!==');
- }
+ public function operator(Twig_Compiler $compiler)
+ {
+ return $compiler->raw('!==');
+ }
}
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
index 2a90dc19e4..a614cbe20f 100644
--- a/phpBB/includes/template/twig/node/include.php
+++ b/phpBB/includes/template/twig/node/include.php
@@ -9,14 +9,14 @@
class phpbb_template_twig_node_include extends Twig_Node_Include
{
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
$compiler
->write("\$location = ")
@@ -26,15 +26,15 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
->write("if (strpos(\$location, '@') === 0) {\n")
->indent()
->write("\$namespace = substr(\$location, 1, strpos(\$location, '/') - 1);\n")
- ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+ ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
- // We set the namespace lookup order to be this namespace first, then the main path
- ->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
+ // We set the namespace lookup order to be this namespace first, then the main path
+ ->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
->outdent()
->write("}\n")
;
- parent::compile($compiler);
+ parent::compile($compiler);
$compiler
->write("if (\$namespace) {\n")
@@ -42,6 +42,6 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
->outdent()
->write("}\n")
- ;
- }
+ ;
+ }
}
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 91b24e8068..6d0d67c6c9 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -12,27 +12,27 @@ class phpbb_template_twig_node_includejs extends Twig_Node
/** @var Twig_Environment */
protected $environment;
- public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
- {
- $this->environment = $environment;
+ public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+ {
+ $this->environment = $environment;
- parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
- }
+ parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+ }
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
$config = $this->environment->get_phpbb_config();
- $compiler
+ $compiler
->write("\$js_file = ")
- ->subcompile($this->getNode('expr'))
+ ->subcompile($this->getNode('expr'))
->raw(";\n")
->write("if (!file_exists(\$js_file)) {\n")
->indent()
@@ -41,7 +41,7 @@ class phpbb_template_twig_node_includejs extends Twig_Node
->write("}\n")
->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
->raw("\$js_file")
- ->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
- ;
- }
+ ->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
+ ;
+ }
}
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index a19ce43653..b5bb2ee9c9 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -12,21 +12,21 @@ class phpbb_template_twig_node_includephp extends Twig_Node
/** @var Twig_Environment */
protected $environment;
- public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
- {
- $this->environment = $environment;
+ public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
+ {
+ $this->environment = $environment;
- parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
- }
+ parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
+ }
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
$config = $this->environment->get_phpbb_config();
@@ -39,12 +39,12 @@ class phpbb_template_twig_node_includephp extends Twig_Node
return;
}
- if ($this->getAttribute('ignore_missing')) {
- $compiler
- ->write("try {\n")
- ->indent()
- ;
- }
+ if ($this->getAttribute('ignore_missing')) {
+ $compiler
+ ->write("try {\n")
+ ->indent()
+ ;
+ }
$compiler
->write("\$location = ")
@@ -68,15 +68,15 @@ class phpbb_template_twig_node_includephp extends Twig_Node
->write("}\n")
;
- if ($this->getAttribute('ignore_missing')) {
- $compiler
- ->outdent()
- ->write("} catch (Twig_Error_Loader \$e) {\n")
- ->indent()
- ->write("// ignore missing template\n")
- ->outdent()
- ->write("}\n\n")
- ;
- }
- }
+ if ($this->getAttribute('ignore_missing')) {
+ $compiler
+ ->outdent()
+ ->write("} catch (Twig_Error_Loader \$e) {\n")
+ ->indent()
+ ->write("// ignore missing template\n")
+ ->outdent()
+ ->write("}\n\n")
+ ;
+ }
+ }
}
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
index 953cd184a7..ebf4947e48 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/includes/template/twig/node/php.php
@@ -12,21 +12,21 @@ class phpbb_template_twig_node_php extends Twig_Node
/** @var Twig_Environment */
protected $environment;
- public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
- {
- $this->environment = $environment;
-
- parent::__construct(array('text' => $text), array(), $lineno, $tag);
- }
-
- /**
- * Compiles the node to PHP.
- *
- * @param Twig_Compiler A Twig_Compiler instance
- */
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->addDebugInfo($this);
+ public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+ {
+ $this->environment = $environment;
+
+ parent::__construct(array('text' => $text), array(), $lineno, $tag);
+ }
+
+ /**
+ * Compiles the node to PHP.
+ *
+ * @param Twig_Compiler A Twig_Compiler instance
+ */
+ public function compile(Twig_Compiler $compiler)
+ {
+ $compiler->addDebugInfo($this);
$config = $this->environment->get_phpbb_config();
@@ -42,5 +42,5 @@ class phpbb_template_twig_node_php extends Twig_Node
$compiler
->raw($this->getNode('text')->getAttribute('data'))
;
- }
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
index ebf7cb4c4a..ed77699b77 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -9,49 +9,49 @@
class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
{
- /**
- * 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();
- $stream = $this->parser->getStream();
- $name = $this->parser->getExpressionParser()->parseExpression();
-
- $capture = false;
- if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
- $stream->next();
- $value = $this->parser->getExpressionParser()->parseExpression();
-
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
- } else {
- $capture = true;
-
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
- $value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
- }
-
- return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
- }
-
- public function decideBlockEnd(Twig_Token $token)
- {
- return $token->test('ENDDEFINE');
- }
-
- /**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
- */
- public function getTag()
- {
- return 'DEFINE';
- }
+ /**
+ * 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();
+ $stream = $this->parser->getStream();
+ $name = $this->parser->getExpressionParser()->parseExpression();
+
+ $capture = false;
+ if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
+ $stream->next();
+ $value = $this->parser->getExpressionParser()->parseExpression();
+
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ } else {
+ $capture = true;
+
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+ $value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ }
+
+ return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
+ }
+
+ public function decideBlockEnd(Twig_Token $token)
+ {
+ return $token->test('ENDDEFINE');
+ }
+
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'DEFINE';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
index 03810454ed..2a6d6b6457 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -9,30 +9,30 @@
class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
{
- /**
- * 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();
+ /**
+ * 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();
- $stream = $this->parser->getStream();
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream = $this->parser->getStream();
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
- }
+ return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+ }
- /**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
- */
- public function getTag()
- {
- return 'EVENT';
- }
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'EVENT';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
index 04ee048f94..939d679030 100644
--- a/phpBB/includes/template/twig/tokenparser/if.php
+++ b/phpBB/includes/template/twig/tokenparser/if.php
@@ -9,70 +9,70 @@
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;
+ /**
+ * 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;
+ $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 '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;
+ 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());
- }
- }
+ 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);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
- }
+ 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 decideIfFork(Twig_Token $token)
+ {
+ return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
+ }
- public function decideIfEnd(Twig_Token $token)
- {
- return $token->test(array('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';
- }
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'IF';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
index 0f7e4faf8f..5b5105d23e 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -9,29 +9,29 @@
class phpbb_template_twig_tokenparser_include 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();
+ /**
+ * 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();
+ list($variables, $only, $ignoreMissing) = $this->parseArguments();
- return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
- }
+ return new phpbb_template_twig_node_include($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 'INCLUDE';
- }
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'INCLUDE';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
index 0b46f315d2..962d01ac45 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -9,30 +9,30 @@
class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
{
- /**
- * 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();
+ /**
+ * 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();
- $stream = $this->parser->getStream();
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream = $this->parser->getStream();
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
- }
+ return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+ }
- /**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
- */
- public function getTag()
- {
- return 'INCLUDEJS';
- }
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'INCLUDEJS';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
index a81d663c09..57d804183b 100644
--- a/phpBB/includes/template/twig/tokenparser/includephp.php
+++ b/phpBB/includes/template/twig/tokenparser/includephp.php
@@ -9,39 +9,39 @@
class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
{
- /**
- * 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();
+ /**
+ * 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();
- $stream = $this->parser->getStream();
+ $stream = $this->parser->getStream();
- $ignoreMissing = false;
- if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
- $stream->next();
- $stream->expect(Twig_Token::NAME_TYPE, 'missing');
+ $ignoreMissing = false;
+ if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
+ $stream->next();
+ $stream->expect(Twig_Token::NAME_TYPE, 'missing');
- $ignoreMissing = true;
- }
+ $ignoreMissing = true;
+ }
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
- }
+ return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
+ }
- /**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
- */
- public function getTag()
- {
- return 'INCLUDEPHP';
- }
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'INCLUDEPHP';
+ }
}
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/includes/template/twig/tokenparser/php.php
index 7db57081e2..62e1c4fdcd 100644
--- a/phpBB/includes/template/twig/tokenparser/php.php
+++ b/phpBB/includes/template/twig/tokenparser/php.php
@@ -9,38 +9,38 @@
class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
{
- /**
- * 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)
- {
- $stream = $this->parser->getStream();
+ /**
+ * 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)
+ {
+ $stream = $this->parser->getStream();
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideEnd'), true);
- $stream->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
- }
+ return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+ }
- public function decideEnd(Twig_Token $token)
- {
- return $token->test('ENDPHP');
- }
+ public function decideEnd(Twig_Token $token)
+ {
+ return $token->test('ENDPHP');
+ }
- /**
- * Gets the tag name associated with this token parser.
- *
- * @return string The tag name
- */
- public function getTag()
- {
- return 'PHP';
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'PHP';
}
}