7 files changed, 51 insertions, 78 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/define.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
index 4ea15388c4..8484f2e81a 100644
--- a/phpBB/phpbb/template/twig/tokenparser/define.php
+++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
+class defineparser extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,31 +19,38 @@ class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	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, '=')) {
+		if ($stream->test(\Twig_Token::OPERATOR_TYPE, '=')) {
 			$stream->next();
 			$value = $this->parser->getExpressionParser()->parseExpression();
 
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+			if ($value instanceof \Twig_Node_Expression_Name)
+			{
+				// This would happen if someone improperly formed their DEFINE syntax
+				// e.g. <!-- DEFINE $VAR = foo -->
+				throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getFilename());
+			}
+
+			$stream->expect(\Twig_Token::BLOCK_END_TYPE);
 		} else {
 			$capture = true;
 
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+			$stream->expect(\Twig_Token::BLOCK_END_TYPE);
 
 			$value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+			$stream->expect(\Twig_Token::BLOCK_END_TYPE);
 		}
 
-		return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
+		return new \phpbb\template\twig\node\definenode($capture, $name, $value, $lineno, $this->getTag());
 	}
 
-	public function decideBlockEnd(Twig_Token $token)
+	public function decideBlockEnd(\Twig_Token $token)
 	{
 		return $token->test('ENDDEFINE');
 	}
diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index e4dddd6dcc..8864e879f8 100644
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
+class event extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,14 +19,14 @@ class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(\Twig_Token $token)
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();
 
 		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$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());
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php
index 6c24dda647..7bf4c610b1 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includecss.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includecss.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
+namespace phpbb\template\twig\tokenparser;
+
+class includecss extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -16,14 +18,14 @@ class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(\Twig_Token $token)
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();
 
 		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream->expect(\Twig_Token::BLOCK_END_TYPE);
 
-		return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+		return new \phpbb\template\twig\node\includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php
index b02b2f89ba..0e46915b86 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includejs.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
+class includejs extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,14 +19,14 @@ class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(\Twig_Token $token)
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();
 
 		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$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());
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/tokenparser/include.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
index 520f9fd1a0..d351f1b4cd 100644
--- a/phpBB/phpbb/template/twig/tokenparser/include.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
+class includeparser extends \Twig_TokenParser_Include
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,13 +19,13 @@ class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(\Twig_Token $token)
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();
 
 		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\includenode($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php
index 13fe6de8a6..1b3d1742e3 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includephp.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
+class includephp extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,23 +19,23 @@ class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(\Twig_Token $token)
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();
 
 		$stream = $this->parser->getStream();
 
 		$ignoreMissing = false;
-		if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
+		if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore')) {
 			$stream->next();
-			$stream->expect(Twig_Token::NAME_TYPE, 'missing');
+			$stream->expect(\Twig_Token::NAME_TYPE, 'missing');
 
 			$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(), $token->getLine(), $ignoreMissing, $this->getTag());
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php
index 197980a59a..b427969e2d 100644
--- a/phpBB/phpbb/template/twig/tokenparser/php.php
+++ b/phpBB/phpbb/template/twig/tokenparser/php.php
@@ -7,16 +7,10 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\template\twig\tokenparser;
 
 
-class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
+class php extends \Twig_TokenParser
 {
 	/**
 	 * Parses a token and returns a node.
@@ -25,20 +19,20 @@ class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
 	 *
 	 * @return Twig_NodeInterface A Twig_NodeInterface instance
 	 */
-	public function parse(Twig_Token $token)
+	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)
+	public function decideEnd(\Twig_Token $token)
 	{
 		return $token->test('ENDPHP');
 	}
@@ -51,5 +45,5 @@ class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
 	public function getTag()
 	{
 		return 'PHP';
-    }
+	}
 }