7 files changed, 72 insertions, 70 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
index 48c4853fe8..cfee84a363 100644
--- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php
+++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
@@ -18,12 +18,14 @@ namespace phpbb\template\twig\tokenparser;
 class defineparser 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
-	 */
+	* Parses a token and returns a node.
+	*
+	* @param \Twig_Token $token A Twig_Token instance
+	*
+	* @return \Twig_NodeInterface A Twig_NodeInterface instance
+	* @throws \Twig_Error_Syntax
+	* @throws \phpbb\template\twig\node\definenode
+	*/
 	public function parse(\Twig_Token $token)
 	{
 		$lineno = $token->getLine();
@@ -61,10 +63,10 @@ class defineparser extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'DEFINE';
diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index 05b963f3e8..4c7c8e07d9 100644
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@@ -17,12 +17,12 @@ namespace phpbb\template\twig\tokenparser;
 class 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
-	 */
+	* 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();
@@ -34,10 +34,10 @@ class event extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'EVENT';
diff --git a/phpBB/phpbb/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php
index c7d2bb712e..1f30811754 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includecss.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includecss.php
@@ -16,12 +16,12 @@ namespace phpbb\template\twig\tokenparser;
 class includecss 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
-	 */
+	* 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();
@@ -33,10 +33,10 @@ class includecss extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'INCLUDECSS';
diff --git a/phpBB/phpbb/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php
index 0c32692209..4156048e42 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includejs.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php
@@ -17,12 +17,12 @@ namespace phpbb\template\twig\tokenparser;
 class 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
-	 */
+	* 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();
@@ -34,10 +34,10 @@ class includejs extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'INCLUDEJS';
diff --git a/phpBB/phpbb/template/twig/tokenparser/includeparser.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
index e9f4db0890..6ee78e5562 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includeparser.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
@@ -18,12 +18,12 @@ namespace phpbb\template\twig\tokenparser;
 class includeparser 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
-	 */
+	* 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();
@@ -34,10 +34,10 @@ class includeparser extends \Twig_TokenParser_Include
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'INCLUDE';
diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php
index f745c320c2..38196c5290 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includephp.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php
@@ -18,12 +18,12 @@ namespace phpbb\template\twig\tokenparser;
 class 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
-	 */
+	* 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();
@@ -44,10 +44,10 @@ class includephp extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'INCLUDEPHP';
diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php
index 0546a2d93f..557a70cca1 100644
--- a/phpBB/phpbb/template/twig/tokenparser/php.php
+++ b/phpBB/phpbb/template/twig/tokenparser/php.php
@@ -17,12 +17,12 @@ namespace phpbb\template\twig\tokenparser;
 class 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
-	 */
+	* 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();
@@ -42,10 +42,10 @@ class php extends \Twig_TokenParser
 	}
 
 	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
+	* Gets the tag name associated with this token parser.
+	*
+	* @return string The tag name
+	*/
 	public function getTag()
 	{
 		return 'PHP';