From 7030578bbe9e11c18b5becaf8b06e670e3c2e3cd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 01:32:34 -0400
Subject: [ticket/11698] Moving all autoloadable files to phpbb/

PHPBB3-11698
---
 phpBB/phpbb/template/twig/node/define.php          | 58 ++++++++++++++
 phpBB/phpbb/template/twig/node/event.php           | 79 +++++++++++++++++++
 .../twig/node/expression/binary/equalequal.php     | 25 ++++++
 .../twig/node/expression/binary/notequalequal.php  | 25 ++++++
 phpBB/phpbb/template/twig/node/include.php         | 56 +++++++++++++
 phpBB/phpbb/template/twig/node/includeasset.php    | 60 ++++++++++++++
 phpBB/phpbb/template/twig/node/includecss.php      | 30 +++++++
 phpBB/phpbb/template/twig/node/includejs.php       | 32 ++++++++
 phpBB/phpbb/template/twig/node/includephp.php      | 91 ++++++++++++++++++++++
 phpBB/phpbb/template/twig/node/php.php             | 55 +++++++++++++
 10 files changed, 511 insertions(+)
 create mode 100644 phpBB/phpbb/template/twig/node/define.php
 create mode 100644 phpBB/phpbb/template/twig/node/event.php
 create mode 100644 phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
 create mode 100644 phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
 create mode 100644 phpBB/phpbb/template/twig/node/include.php
 create mode 100644 phpBB/phpbb/template/twig/node/includeasset.php
 create mode 100644 phpBB/phpbb/template/twig/node/includecss.php
 create mode 100644 phpBB/phpbb/template/twig/node/includejs.php
 create mode 100644 phpBB/phpbb/template/twig/node/includephp.php
 create mode 100644 phpBB/phpbb/template/twig/node/php.php

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/define.php
new file mode 100644
index 0000000000..fcb19cc773
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/define.php
@@ -0,0 +1,58 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+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);
+	}
+
+	/**
+	 * 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
+				->write("ob_start();\n")
+				->subcompile($this->getNode('value'))
+			;
+
+			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
+		}
+		else
+		{
+			$compiler
+				->write("\$value = ")
+				->subcompile($this->getNode('value'))
+				->raw(";\n")
+			;
+		}
+
+		$compiler
+			->write("\$context['definition']->set('")
+			->raw($this->getNode('name')->getAttribute('name'))
+			->raw("', \$value);\n")
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
new file mode 100644
index 0000000000..971dea14fa
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -0,0 +1,79 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+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 (defined('DEBUG'))
+			{
+				// If debug mode is enabled, lets check for new/removed EVENT
+				//  templates on page load rather than at compile. This is
+				//  slower, but makes developing extensions easier (no need to
+				//  purge the cache when a new event template file is added)
+		        $compiler
+		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
+		            ->indent()
+		        ;
+			}
+
+			if (defined('DEBUG') || $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")
+				;
+			}
+
+			if (defined('DEBUG'))
+			{
+				$compiler
+					->outdent()
+		            ->write("}\n\n")
+				;
+			}
+		}
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
new file mode 100644
index 0000000000..8ec2069114
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
+{
+	public function operator(Twig_Compiler $compiler)
+	{
+		return $compiler->raw('===');
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
new file mode 100644
index 0000000000..96f32c502e
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
+{
+	public function operator(Twig_Compiler $compiler)
+	{
+		return $compiler->raw('!==');
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/include.php
new file mode 100644
index 0000000000..5c6ae1bbcf
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/include.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+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);
+
+		$compiler
+			->write("\$location = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$namespace = false;\n")
+			->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")
+
+				// 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);
+
+		$compiler
+			->write("if (\$namespace) {\n")
+			->indent()
+				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+			->outdent()
+			->write("}\n")
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
new file mode 100644
index 0000000000..990b1c984f
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -0,0 +1,60 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includeasset 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);
+
+		$config = $this->environment->get_phpbb_config();
+
+		$compiler
+			->write("\$asset_file = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
+			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
+			->indent()
+				->write("\$asset_path = \$asset->get_path();")
+				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
+				->write("if (!file_exists(\$local_file)) {\n")
+				->indent()
+					->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n")
+					->write("\$asset->set_path(\$local_file, true);\n")
+				->outdent()
+				->write("\$asset->add_assets_version({$config['assets_version']});\n")
+				->write("\$asset_file = \$asset->get_url();\n")
+				->write("}\n")
+			->outdent()
+			->write("}\n")
+			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
+		;
+
+		$this->append_asset($compiler);
+
+		$compiler
+			->raw("\n');\n")
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
new file mode 100644
index 0000000000..01fda44aad
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'STYLESHEETS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function append_asset(Twig_Compiler $compiler)
+	{
+		$compiler
+			->raw("<link href=\"' . ")
+			->raw("\$asset_file . '\"")
+			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
new file mode 100644
index 0000000000..fdf2bea3ed
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'SCRIPTS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	protected function append_asset(Twig_Compiler $compiler)
+	{
+		$config = $this->environment->get_phpbb_config();
+
+		$compiler
+			->raw("<script type=\"text/javascript\" src=\"' . ")
+			->raw("\$asset_file")
+			->raw(". '\"></script>\n")
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
new file mode 100644
index 0000000000..dbe54f0e1a
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -0,0 +1,91 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+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;
+
+		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);
+
+		$config = $this->environment->get_phpbb_config();
+
+		if (!$config['tpl_allow_php'])
+		{
+			$compiler
+				->write("// INCLUDEPHP Disabled\n")
+			;
+
+			return;
+		}
+
+		if ($this->getAttribute('ignore_missing')) {
+			$compiler
+				->write("try {\n")
+				->indent()
+			;
+		}
+
+		$compiler
+			->write("\$location = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("if (phpbb_is_absolute(\$location)) {\n")
+			->indent()
+				// Absolute path specified
+				->write("require(\$location);\n")
+			->outdent()
+			->write("} else if (file_exists(\$this->getEnvironment()->get_phpbb_root_path() . \$location)) {\n")
+			->indent()
+				// PHP file relative to phpbb_root_path
+				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . \$location);\n")
+			->outdent()
+			->write("} else {\n")
+			->indent()
+				// Local path (behaves like INCLUDE)
+				->write("require(\$this->getEnvironment()->getLoader()->getCacheKey(\$location));\n")
+			->outdent()
+			->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")
+			;
+		}
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
new file mode 100644
index 0000000000..c11539ea7f
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+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);
+
+		$config = $this->environment->get_phpbb_config();
+
+		if (!$config['tpl_allow_php'])
+		{
+			$compiler
+				->write("// PHP Disabled\n")
+			;
+
+			return;
+		}
+
+		$compiler
+			->raw($this->getNode('text')->getAttribute('data'))
+		;
+	}
+}
-- 
cgit v1.2.1


From 62b33968c2ef7c5bf264f8af2a39eac2183148f7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 15:38:04 -0400
Subject: [ticket/11700] include and define are not valid class names

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/define.php      | 58 --------------------------
 phpBB/phpbb/template/twig/node/definenode.php  | 58 ++++++++++++++++++++++++++
 phpBB/phpbb/template/twig/node/include.php     | 56 -------------------------
 phpBB/phpbb/template/twig/node/includenode.php | 56 +++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 114 deletions(-)
 delete mode 100644 phpBB/phpbb/template/twig/node/define.php
 create mode 100644 phpBB/phpbb/template/twig/node/definenode.php
 delete mode 100644 phpBB/phpbb/template/twig/node/include.php
 create mode 100644 phpBB/phpbb/template/twig/node/includenode.php

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/define.php
deleted file mode 100644
index fcb19cc773..0000000000
--- a/phpBB/phpbb/template/twig/node/define.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-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);
-	}
-
-	/**
-	 * 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
-				->write("ob_start();\n")
-				->subcompile($this->getNode('value'))
-			;
-
-			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
-		}
-		else
-		{
-			$compiler
-				->write("\$value = ")
-				->subcompile($this->getNode('value'))
-				->raw(";\n")
-			;
-		}
-
-		$compiler
-			->write("\$context['definition']->set('")
-			->raw($this->getNode('name')->getAttribute('name'))
-			->raw("', \$value);\n")
-		;
-	}
-}
diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
new file mode 100644
index 0000000000..247b908337
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -0,0 +1,58 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+class phpbb_template_twig_node_definenode 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);
+	}
+
+	/**
+	 * 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
+				->write("ob_start();\n")
+				->subcompile($this->getNode('value'))
+			;
+
+			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
+		}
+		else
+		{
+			$compiler
+				->write("\$value = ")
+				->subcompile($this->getNode('value'))
+				->raw(";\n")
+			;
+		}
+
+		$compiler
+			->write("\$context['definition']->set('")
+			->raw($this->getNode('name')->getAttribute('name'))
+			->raw("', \$value);\n")
+		;
+	}
+}
diff --git a/phpBB/phpbb/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/include.php
deleted file mode 100644
index 5c6ae1bbcf..0000000000
--- a/phpBB/phpbb/template/twig/node/include.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-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);
-
-		$compiler
-			->write("\$location = ")
-			->subcompile($this->getNode('expr'))
-			->raw(";\n")
-			->write("\$namespace = false;\n")
-			->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")
-
-				// 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);
-
-		$compiler
-			->write("if (\$namespace) {\n")
-			->indent()
-				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-			->outdent()
-			->write("}\n")
-		;
-	}
-}
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
new file mode 100644
index 0000000000..c5d1c6be51
--- /dev/null
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
+class phpbb_template_twig_node_includenode 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);
+
+		$compiler
+			->write("\$location = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$namespace = false;\n")
+			->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")
+
+				// 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);
+
+		$compiler
+			->write("if (\$namespace) {\n")
+			->indent()
+				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+			->outdent()
+			->write("}\n")
+		;
+	}
+}
-- 
cgit v1.2.1


From bf04bfcced7934704e7f2682ee608f490cb3fc76 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 23 Jul 2013 11:16:23 -0500
Subject: [ticket/11667] Use @inheritdoc

PHPBB3-11667
---
 phpBB/phpbb/template/twig/node/includecss.php | 9 ++-------
 phpBB/phpbb/template/twig/node/includejs.php  | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 450edb3e1e..a9d9b46d69 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -10,9 +10,7 @@
 class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
 {
 	/**
-	* Get the definition name
-	*
-	* @return string (e.g. 'SCRIPTS')
+	* {@inheritdoc}
 	*/
 	public function get_definition_name()
 	{
@@ -20,10 +18,7 @@ class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_inclu
 	}
 
 	/**
-	* Append the output code for the asset
-	*
-	* @param Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* {@inheritdoc}
 	*/
 	public function append_asset(Twig_Compiler $compiler)
 	{
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 50ab448e0f..2b4b55fb0a 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -10,9 +10,7 @@
 class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
 {
 	/**
-	* Get the definition name
-	*
-	* @return string (e.g. 'SCRIPTS')
+	* {@inheritdoc}
 	*/
 	public function get_definition_name()
 	{
@@ -20,10 +18,7 @@ class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includ
 	}
 
 	/**
-	* Append the output code for the asset
-	*
-	* @param Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* {@inheritdoc}
 	*/
 	protected function append_asset(Twig_Compiler $compiler)
 	{
-- 
cgit v1.2.1


From 49824a0fd33df6b9da4e413ccd189379fb7f728b Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Thu, 8 Aug 2013 11:31:06 +0200
Subject: [ticket/11777] Add subdirectory 'events/' to the template event
 search path

Makes the twig template engine look in the events/ subdirectory instead of the
main styles/[style]/template/ directory for extension template events. Note
that it does _not_ look recursively!

PHPBB3-11777
---
 phpBB/phpbb/template/twig/node/event.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 971dea14fa..30a9963a77 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -18,6 +18,11 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_template_twig_node_event extends Twig_Node
 {
+	/** 
+	 * The subdirectory in which all template event files must be placed
+	 */
+	const TEMPLATE_EVENTS_SUBDIRECTORY = 'events/';
+
 	/** @var Twig_Environment */
 	protected $environment;
 
@@ -50,19 +55,19 @@ class phpbb_template_twig_node_event extends Twig_Node
 				//  slower, but makes developing extensions easier (no need to
 				//  purge the cache when a new event template file is added)
 		        $compiler
-		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
+		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')) {\n")
 		            ->indent()
 		        ;
 			}
 
-			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . self::TEMPLATE_EVENTS_SUBDIRECTORY . $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->loadTemplate('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')->display(\$context);\n")
 					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
 				;
 			}
-- 
cgit v1.2.1


From 7f76c9f9c7d9014f313f150a9596bec030f39915 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Fri, 9 Aug 2013 11:33:24 +0200
Subject: [ticket/11777] Rename the extension template listener subdirectory to
 'event/'

Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
---
 phpBB/phpbb/template/twig/node/event.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 30a9963a77..c94e5fdf20 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -19,9 +19,10 @@ if (!defined('IN_PHPBB'))
 class phpbb_template_twig_node_event extends Twig_Node
 {
 	/** 
-	 * The subdirectory in which all template event files must be placed
+	 * The subdirectory in which all template listener files must be placed
+	 * @var string
 	 */
-	const TEMPLATE_EVENTS_SUBDIRECTORY = 'events/';
+	protected $listener_directory = 'event/';
 
 	/** @var Twig_Environment */
 	protected $environment;
@@ -42,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		$location = $this->getNode('expr')->getAttribute('name');
+		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
 
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
@@ -55,19 +56,19 @@ class phpbb_template_twig_node_event extends Twig_Node
 				//  slower, but makes developing extensions easier (no need to
 				//  purge the cache when a new event template file is added)
 		        $compiler
-		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')) {\n")
+		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
 		            ->indent()
 		        ;
 			}
 
-			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . self::TEMPLATE_EVENTS_SUBDIRECTORY . $location . '.html'))
+			if (defined('DEBUG') || $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}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')->display(\$context);\n")
+					->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
 					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
 				;
 			}
-- 
cgit v1.2.1


From 08e6c6118036700f5d4196aa09d9d1a34b840514 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Fri, 9 Aug 2013 11:39:43 +0200
Subject: [ticket/11777] Require a suffix of '_listener' on extension template
 listeners

To further mirror the file name and location requirements for php template
event listeners, require extension template event listener files to follow the
'<event name>_listener.html' naming format.

PHPBB3-11777
---
 phpBB/phpbb/template/twig/node/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index c94e5fdf20..4533151d05 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -43,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
+		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name') . '_listener';
 
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
-- 
cgit v1.2.1


From 65d8cd63022d688fe618f128768b78a6214db166 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 13 Aug 2013 02:14:22 -0700
Subject: [ticket/11784] Remove naming redundancy for event listeners

PHPBB3-11784
---
 phpBB/phpbb/template/twig/node/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 4533151d05..c94e5fdf20 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -43,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name') . '_listener';
+		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
 
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
-- 
cgit v1.2.1


From 423357581415c7c10ed0ac51284014e839881bac Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 2 Sep 2013 13:54:42 -0500
Subject: [ticket/11822] Use namespace lookup order for asset loading

PHPBB3-11822
---
 phpBB/phpbb/template/twig/node/includeasset.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 1cab416c79..0808e2b10e 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -40,10 +40,10 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
 				->write("if (!file_exists(\$local_file)) {\n")
 				->indent()
-					->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n")
+					->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")
 					->write("\$asset->set_path(\$local_file, true);\n")
 				->outdent()
-				->write("\$asset->add_assets_version({$config['assets_version']});\n")
+				->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
 				->write("\$asset_file = \$asset->get_url();\n")
 				->write("}\n")
 			->outdent()
-- 
cgit v1.2.1


From b4a374dc73eda55db1c67b87bd65a73f79411ef5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 13 Sep 2013 10:58:03 -0500
Subject: [ticket/11832] Fix INCLUDE(JS/CSS)

PHPBB3-11832
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 0808e2b10e..2dcd2003a3 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -37,7 +37,7 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
+				->write("\$local_file = \$this->getEnvironment()->get_web_root_path() . \$asset_path;\n")
 				->write("if (!file_exists(\$local_file)) {\n")
 				->indent()
 					->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")
-- 
cgit v1.2.1


From 9e8babbf6eae65aa894cb0d8c4b452133ac344a8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 15 Sep 2013 16:42:02 -0500
Subject: [ticket/11832] get_url() from phpbb_template_asset should return web
 path

PHPBB3-11832
---
 phpBB/phpbb/template/twig/node/includeasset.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 2dcd2003a3..8629395898 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -33,11 +33,11 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
+			->write("\$asset = new phpbb_template_asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-				->write("\$local_file = \$this->getEnvironment()->get_web_root_path() . \$asset_path;\n")
+				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
 				->write("if (!file_exists(\$local_file)) {\n")
 				->indent()
 					->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")
-- 
cgit v1.2.1


From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/definenode.php                  | 10 ++++++----
 phpBB/phpbb/template/twig/node/event.php                       | 10 ++++++----
 .../phpbb/template/twig/node/expression/binary/equalequal.php  |  6 ++++--
 .../template/twig/node/expression/binary/notequalequal.php     |  6 ++++--
 phpBB/phpbb/template/twig/node/includeasset.php                | 10 ++++++----
 phpBB/phpbb/template/twig/node/includecss.php                  |  6 ++++--
 phpBB/phpbb/template/twig/node/includejs.php                   |  6 ++++--
 phpBB/phpbb/template/twig/node/includenode.php                 |  6 ++++--
 phpBB/phpbb/template/twig/node/includephp.php                  | 10 ++++++----
 phpBB/phpbb/template/twig/node/php.php                         |  8 +++++---
 10 files changed, 49 insertions(+), 29 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index 247b908337..ec084d0f7d 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node;
+
 /**
 * @ignore
 */
@@ -16,9 +18,9 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_definenode extends Twig_Node
+class definenode extends \Twig_Node
 {
-	public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
+	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);
 	}
@@ -28,7 +30,7 @@ class phpbb_template_twig_node_definenode extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
@@ -38,7 +40,7 @@ class phpbb_template_twig_node_definenode extends Twig_Node
 				->subcompile($this->getNode('value'))
 			;
 
-			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
+			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new \Twig_Markup(\$value, \$this->env->getCharset());\n");
 		}
 		else
 		{
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 971dea14fa..a55e68fb04 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node;
+
 /**
 * @ignore
 */
@@ -16,12 +18,12 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_event extends Twig_Node
+class event extends \Twig_Node
 {
 	/** @var Twig_Environment */
 	protected $environment;
 
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
 	{
 		$this->environment = $environment;
 
@@ -33,7 +35,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
@@ -48,7 +50,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 				// If debug mode is enabled, lets check for new/removed EVENT
 				//  templates on page load rather than at compile. This is
 				//  slower, but makes developing extensions easier (no need to
-				//  purge the cache when a new event template file is added)
+				//  purge the cache when a new \event template file is added)
 		        $compiler
 		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
 		            ->indent()
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
index 8ec2069114..48d8b814b8 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node\expression\binary;
+
 /**
 * @ignore
 */
@@ -16,9 +18,9 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
+class equalequal extends \Twig_Node_Expression_Binary
 {
-	public function operator(Twig_Compiler $compiler)
+	public function operator(\Twig_Compiler $compiler)
 	{
 		return $compiler->raw('===');
 	}
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
index 96f32c502e..87585dfb4c 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node\expression\binary;
+
 /**
 * @ignore
 */
@@ -16,9 +18,9 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
+class notequalequal extends \Twig_Node_Expression_Binary
 {
-	public function operator(Twig_Compiler $compiler)
+	public function operator(\Twig_Compiler $compiler)
 	{
 		return $compiler->raw('!==');
 	}
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 990b1c984f..f5c6413617 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -7,12 +7,14 @@
 *
 */
 
-class phpbb_template_twig_node_includeasset extends Twig_Node
+namespace phpbb\template\twig\node;
+
+class includeasset extends \Twig_Node
 {
 	/** @var Twig_Environment */
 	protected $environment;
 
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
 	{
 		$this->environment = $environment;
 
@@ -23,7 +25,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
@@ -33,7 +35,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
+			->write("\$asset = new \phpbb\template\asset(\$asset_file);\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 01fda44aad..45ff9107a0 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
+namespace phpbb\template\twig\node;
+
+class includecss extends \phpbb\template\twig\node\includeasset
 {
 	public function get_definition_name()
 	{
@@ -19,7 +21,7 @@ class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_inclu
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function append_asset(Twig_Compiler $compiler)
+	public function append_asset(\Twig_Compiler $compiler)
 	{
 		$compiler
 			->raw("<link href=\"' . ")
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index fdf2bea3ed..7b400d9154 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
+namespace phpbb\template\twig\node;
+
+class includejs extends \phpbb\template\twig\node\includeasset
 {
 	public function get_definition_name()
 	{
@@ -19,7 +21,7 @@ class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includ
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	protected function append_asset(Twig_Compiler $compiler)
+	protected function append_asset(\Twig_Compiler $compiler)
 	{
 		$config = $this->environment->get_phpbb_config();
 
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index c5d1c6be51..77fe7f3acb 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node;
+
 /**
 * @ignore
 */
@@ -16,14 +18,14 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_includenode extends Twig_Node_Include
+class includenode extends \Twig_Node_Include
 {
 	/**
 	 * Compiles the node to PHP.
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index dbe54f0e1a..4024cf0cc8 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node;
+
 /**
 * @ignore
 */
@@ -16,12 +18,12 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_includephp extends Twig_Node
+class 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)
+	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $ignoreMissing = false, $lineno, $tag = null)
 	{
 		$this->environment = $environment;
 
@@ -33,7 +35,7 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
@@ -80,7 +82,7 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 		if ($this->getAttribute('ignore_missing')) {
 			$compiler
 				->outdent()
-				->write("} catch (Twig_Error_Loader \$e) {\n")
+				->write("} catch (\Twig_Error_Loader \$e) {\n")
 				->indent()
 				->write("// ignore missing template\n")
 				->outdent()
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index c11539ea7f..b37759303d 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace phpbb\template\twig\node;
+
 /**
 * @ignore
 */
@@ -16,12 +18,12 @@ if (!defined('IN_PHPBB'))
 }
 
 
-class phpbb_template_twig_node_php extends Twig_Node
+class php extends \Twig_Node
 {
 	/** @var Twig_Environment */
 	protected $environment;
 
-	public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	public function __construct(\Twig_Node_Text $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
 	{
 		$this->environment = $environment;
 
@@ -33,7 +35,7 @@ class phpbb_template_twig_node_php extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
 
-- 
cgit v1.2.1


From dc2f4a3663ef10e6d562426764db657caeb1f435 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 15:43:33 +0200
Subject: [ticket/11700] Avoid \t in double quoted strings for template code

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index f5c6413617..3c899b96e8 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -35,7 +35,7 @@ class includeasset extends \Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new \phpbb\template\asset(\$asset_file);\n")
+			->write("\$asset = new \phpbb\\template\asset(\$asset_file);\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-- 
cgit v1.2.1


From 2472271bc0cd7c15c77783c86ccaac643ab1756a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 02:41:03 +0200
Subject: [ticket/11700] Fix tests after merging new develop code

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 +-
 phpBB/phpbb/template/twig/node/includecss.php   | 2 +-
 phpBB/phpbb/template/twig/node/includejs.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index d632469c9e..eeedeb31f0 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -73,5 +73,5 @@ abstract class includeasset extends \Twig_Node
 	* @param Twig_Compiler A Twig_Compiler instance
 	* @return null
 	*/
-	abstract protected function append_asset(Twig_Compiler $compiler);
+	abstract protected function append_asset(\Twig_Compiler $compiler);
 }
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 9601cc5155..deb279fa4a 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -22,7 +22,7 @@ class includecss extends \phpbb\template\twig\node\includeasset
 	/**
 	* {@inheritdoc}
 	*/
-	public function append_asset(Twig_Compiler $compiler)
+	public function append_asset(\Twig_Compiler $compiler)
 	{
 		$compiler
 			->raw("<link href=\"' . ")
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 510e221e07..696b640eac 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -22,7 +22,7 @@ class includejs extends \phpbb\template\twig\node\includeasset
 	/**
 	* {@inheritdoc}
 	*/
-	protected function append_asset(Twig_Compiler $compiler)
+	protected function append_asset(\Twig_Compiler $compiler)
 	{
 		$config = $this->environment->get_phpbb_config();
 
-- 
cgit v1.2.1


From 390dc86344c23b658085bae4a719399e5eb579f0 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 16 Sep 2013 05:00:18 +0200
Subject: [ticket/11700] And some last comments with backslashes

PHPBB3-11700
---
 phpBB/phpbb/template/twig/node/event.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 1fc85ab4a2..202db775ee 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 
 class event extends \Twig_Node
 {
-	/** 
+	/**
 	 * The subdirectory in which all template listener files must be placed
 	 * @var string
 	 */
@@ -56,7 +56,7 @@ class event extends \Twig_Node
 				// If debug mode is enabled, lets check for new/removed EVENT
 				//  templates on page load rather than at compile. This is
 				//  slower, but makes developing extensions easier (no need to
-				//  purge the cache when a new \event template file is added)
+				//  purge the cache when a new event template file is added)
 		        $compiler
 		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
 		            ->indent()
-- 
cgit v1.2.1


From 7525c49d454e1ff4a156709ea9ecc1dc0b28dd6e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 26 Sep 2013 15:34:44 +0200
Subject: [ticket/11852] Split filesystem and path_helper into 2 classes

PHPBB3-11852
---
 phpBB/phpbb/template/twig/node/includeasset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index f15fd6296b..f6c9dc9c58 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -35,7 +35,7 @@ abstract class includeasset extends \Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n")
+			->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_path_helper());\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
-- 
cgit v1.2.1


From 7f58a4572eaca75aecff2da889e67ea151616011 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 28 Oct 2013 22:27:25 +0100
Subject: [ticket/11981] Fix code sniffer complaints

PHPBB3-11981
---
 phpBB/phpbb/template/twig/node/includephp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 4024cf0cc8..70dcf85d62 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -23,7 +23,7 @@ class 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)
+	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false,  $tag = null)
 	{
 		$this->environment = $environment;
 
-- 
cgit v1.2.1


From 02e9f6e2840d7227f158b4baf96fd9c0f6207531 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 29 Oct 2013 21:31:07 +0100
Subject: [task/code-sniffer] Fix argument list spacing.

PHPBB3-11980
---
 phpBB/phpbb/template/twig/node/includephp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 70dcf85d62..1d3e51f54a 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -23,7 +23,7 @@ class includephp extends \Twig_Node
 	/** @var Twig_Environment */
 	protected $environment;
 
-	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false,  $tag = null)
+	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null)
 	{
 		$this->environment = $environment;
 
-- 
cgit v1.2.1


From 7aa8f6461f1e85cf91931f56b95384e54fec07c2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 Oct 2013 13:05:28 +0100
Subject: [task/code-sniffer] Remove the IN_PHPBB check side-effect from class
 files.

PHPBB3-11980
---
 phpBB/phpbb/template/twig/node/definenode.php                     | 8 --------
 phpBB/phpbb/template/twig/node/event.php                          | 8 --------
 phpBB/phpbb/template/twig/node/expression/binary/equalequal.php   | 8 --------
 .../phpbb/template/twig/node/expression/binary/notequalequal.php  | 8 --------
 phpBB/phpbb/template/twig/node/includenode.php                    | 8 --------
 phpBB/phpbb/template/twig/node/includephp.php                     | 8 --------
 phpBB/phpbb/template/twig/node/php.php                            | 8 --------
 7 files changed, 56 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index ec084d0f7d..6a9969f8c6 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class definenode extends \Twig_Node
 {
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 202db775ee..a8d4d06333 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class event extends \Twig_Node
 {
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
index 48d8b814b8..f3bbfa6691 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node\expression\binary;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class equalequal extends \Twig_Node_Expression_Binary
 {
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
index 87585dfb4c..c9c2687e08 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node\expression\binary;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class notequalequal extends \Twig_Node_Expression_Binary
 {
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index 77fe7f3acb..d9b45d6407 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class includenode extends \Twig_Node_Include
 {
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 1d3e51f54a..3f4621c0a9 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class includephp extends \Twig_Node
 {
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index b37759303d..2b18551266 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -9,14 +9,6 @@
 
 namespace phpbb\template\twig\node;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 
 class php extends \Twig_Node
 {
-- 
cgit v1.2.1


From ef1f99183796f8e246f96bca54ca439bf8ea1750 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 Oct 2013 13:37:29 +0100
Subject: [task/code-sniffer] Replace spaces with tabs.

PHPBB3-11980
---
 phpBB/phpbb/template/twig/node/event.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index a8d4d06333..7a1181a866 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -49,10 +49,10 @@ class event extends \Twig_Node
 				//  templates on page load rather than at compile. This is
 				//  slower, but makes developing extensions easier (no need to
 				//  purge the cache when a new event template file is added)
-		        $compiler
-		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
-		            ->indent()
-		        ;
+				$compiler
+					->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
+					->indent()
+				;
 			}
 
 			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
@@ -71,7 +71,7 @@ class event extends \Twig_Node
 			{
 				$compiler
 					->outdent()
-		            ->write("}\n\n")
+					->write("}\n\n")
 				;
 			}
 		}
-- 
cgit v1.2.1


From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 20:18:06 +0200
Subject: [ticket/12594] Remove @package tags and update file headers

PHPBB3-12594
---
 phpBB/phpbb/template/twig/node/definenode.php                 | 11 ++++++++---
 phpBB/phpbb/template/twig/node/event.php                      | 10 +++++++---
 .../phpbb/template/twig/node/expression/binary/equalequal.php | 10 +++++++---
 .../template/twig/node/expression/binary/notequalequal.php    | 10 +++++++---
 phpBB/phpbb/template/twig/node/includeasset.php               | 10 +++++++---
 phpBB/phpbb/template/twig/node/includecss.php                 | 10 +++++++---
 phpBB/phpbb/template/twig/node/includejs.php                  | 10 +++++++---
 phpBB/phpbb/template/twig/node/includenode.php                | 10 +++++++---
 phpBB/phpbb/template/twig/node/includephp.php                 | 11 ++++++++---
 phpBB/phpbb/template/twig/node/php.php                        | 10 +++++++---
 10 files changed, 72 insertions(+), 30 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index 6a9969f8c6..fe336d4129 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -1,9 +1,14 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @copyright Portions (c) 2009 Fabien Potencier, Armin Ronacher
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 7a1181a866..b551d7a75e 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
index f3bbfa6691..8c7f7b378d 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
index c9c2687e08..2e95c68090 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index f6c9dc9c58..c41d4d03f3 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index deb279fa4a..2ce63402aa 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 696b640eac..0f67f9ff60 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index d9b45d6407..141c9ffe66 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 3f4621c0a9..e7df11c74e 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -1,9 +1,14 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* Sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index 2b18551266..de3a8a4af1 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
-- 
cgit v1.2.1


From 0d0113e6da590c113068a60864d44372a2fbccab Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 15 Jun 2014 15:05:51 +0200
Subject: [ticket/12715] Cleanup comments in \phpbb\template\*

PHPBB3-12715
---
 phpBB/phpbb/template/twig/node/definenode.php   |  8 ++++----
 phpBB/phpbb/template/twig/node/event.php        | 16 ++++++++--------
 phpBB/phpbb/template/twig/node/includeasset.php | 12 ++++++------
 phpBB/phpbb/template/twig/node/includenode.php  |  8 ++++----
 phpBB/phpbb/template/twig/node/includephp.php   | 10 +++++-----
 phpBB/phpbb/template/twig/node/php.php          | 10 +++++-----
 6 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index fe336d4129..695ec4281f 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -23,10 +23,10 @@ class definenode extends \Twig_Node
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index b551d7a75e..8fc4ba4775 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -17,12 +17,12 @@ namespace phpbb\template\twig\node;
 class event extends \Twig_Node
 {
 	/**
-	 * The subdirectory in which all template listener files must be placed
-	 * @var string
-	 */
+	* The subdirectory in which all template listener files must be placed
+	* @var string
+	*/
 	protected $listener_directory = 'event/';
 
-	/** @var Twig_Environment */
+	/** @var \Twig_Environment */
 	protected $environment;
 
 	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
@@ -33,10 +33,10 @@ class event extends \Twig_Node
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index c41d4d03f3..15195a226b 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -15,7 +15,7 @@ namespace phpbb\template\twig\node;
 
 abstract class includeasset extends \Twig_Node
 {
-	/** @var Twig_Environment */
+	/** @var \Twig_Environment */
 	protected $environment;
 
 	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
@@ -25,10 +25,10 @@ abstract class includeasset extends \Twig_Node
 		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
 	}
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
@@ -74,7 +74,7 @@ abstract class includeasset extends \Twig_Node
 	/**
 	* Append the output code for the asset
 	*
-	* @param Twig_Compiler A Twig_Compiler instance
+	* @param \Twig_Compiler A Twig_Compiler instance
 	* @return null
 	*/
 	abstract protected function append_asset(\Twig_Compiler $compiler);
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index 141c9ffe66..42428b6106 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -17,10 +17,10 @@ namespace phpbb\template\twig\node;
 class includenode extends \Twig_Node_Include
 {
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index e7df11c74e..826617e8e8 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -17,7 +17,7 @@ namespace phpbb\template\twig\node;
 
 class includephp extends \Twig_Node
 {
-	/** @var Twig_Environment */
+	/** @var \Twig_Environment */
 	protected $environment;
 
 	public function __construct(\Twig_Node_Expression $expr, \phpbb\template\twig\environment $environment, $lineno, $ignoreMissing = false, $tag = null)
@@ -28,10 +28,10 @@ class includephp extends \Twig_Node
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index de3a8a4af1..3a24513dca 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -16,7 +16,7 @@ namespace phpbb\template\twig\node;
 
 class php extends \Twig_Node
 {
-	/** @var Twig_Environment */
+	/** @var \Twig_Environment */
 	protected $environment;
 
 	public function __construct(\Twig_Node_Text $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
@@ -27,10 +27,10 @@ class php extends \Twig_Node
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Compiles the node to PHP.
+	*
+	* @param \Twig_Compiler A Twig_Compiler instance
+	*/
 	public function compile(\Twig_Compiler $compiler)
 	{
 		$compiler->addDebugInfo($this);
-- 
cgit v1.2.1


From 62e13e945c475c416c4fb9deff8f234d3508a598 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Thu, 14 May 2015 13:32:25 +0200
Subject: [ticket/13838] Fix coding style

PHPBB3-13838
---
 phpBB/phpbb/template/twig/node/definenode.php | 3 ++-
 phpBB/phpbb/template/twig/node/includephp.php | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index 695ec4281f..c110785c4b 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -31,7 +31,8 @@ class definenode extends \Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		if ($this->getAttribute('capture')) {
+		if ($this->getAttribute('capture'))
+		{
 			$compiler
 				->write("ob_start();\n")
 				->subcompile($this->getNode('value'))
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 826617e8e8..659495fd9e 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -47,7 +47,8 @@ class includephp extends \Twig_Node
 			return;
 		}
 
-		if ($this->getAttribute('ignore_missing')) {
+		if ($this->getAttribute('ignore_missing'))
+		{
 			$compiler
 				->write("try {\n")
 				->indent()
@@ -76,7 +77,8 @@ class includephp extends \Twig_Node
 			->write("}\n")
 		;
 
-		if ($this->getAttribute('ignore_missing')) {
+		if ($this->getAttribute('ignore_missing'))
+		{
 			$compiler
 				->outdent()
 				->write("} catch (\Twig_Error_Loader \$e) {\n")
-- 
cgit v1.2.1


From a462f14aa367e9b8f94c4d2da35458353bad8c0f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Tue, 28 Apr 2015 01:01:09 +0200
Subject: [ticket/13790] Update phpcs

PHPBB3-13790
---
 phpBB/phpbb/template/twig/node/definenode.php                      | 1 -
 phpBB/phpbb/template/twig/node/event.php                           | 1 -
 phpBB/phpbb/template/twig/node/expression/binary/equalequal.php    | 1 -
 phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php | 1 -
 phpBB/phpbb/template/twig/node/includenode.php                     | 1 -
 phpBB/phpbb/template/twig/node/includephp.php                      | 1 -
 phpBB/phpbb/template/twig/node/php.php                             | 1 -
 7 files changed, 7 deletions(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index 695ec4281f..84d0d8a645 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -14,7 +14,6 @@
 
 namespace phpbb\template\twig\node;
 
-
 class definenode extends \Twig_Node
 {
 	public function __construct($capture, \Twig_NodeInterface $name, \Twig_NodeInterface $value, $lineno, $tag = null)
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 8fc4ba4775..b765bde98d 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\template\twig\node;
 
-
 class event extends \Twig_Node
 {
 	/**
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
index 8c7f7b378d..2cd15d59da 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\template\twig\node\expression\binary;
 
-
 class equalequal extends \Twig_Node_Expression_Binary
 {
 	public function operator(\Twig_Compiler $compiler)
diff --git a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
index 2e95c68090..5f2908fb9b 100644
--- a/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\template\twig\node\expression\binary;
 
-
 class notequalequal extends \Twig_Node_Expression_Binary
 {
 	public function operator(\Twig_Compiler $compiler)
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index 42428b6106..c36ac3c324 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\template\twig\node;
 
-
 class includenode extends \Twig_Node_Include
 {
 	/**
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 826617e8e8..15fefd761a 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -14,7 +14,6 @@
 
 namespace phpbb\template\twig\node;
 
-
 class includephp extends \Twig_Node
 {
 	/** @var \Twig_Environment */
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index 3a24513dca..4ee415e446 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -13,7 +13,6 @@
 
 namespace phpbb\template\twig\node;
 
-
 class php extends \Twig_Node
 {
 	/** @var \Twig_Environment */
-- 
cgit v1.2.1


From 498a5160176625ba0311a1853c5399372731e623 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 7 Jul 2015 20:09:01 -0700
Subject: [ticket/13995] Remove deprecated projection media type

PHPBB3-13995
---
 phpBB/phpbb/template/twig/node/includecss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/template/twig/node')

diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 2ce63402aa..2dac154036 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -31,7 +31,7 @@ class includecss extends \phpbb\template\twig\node\includeasset
 		$compiler
 			->raw("<link href=\"' . ")
 			->raw("\$asset_file . '\"")
-			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
+			->raw(' rel="stylesheet" type="text/css" media="screen" />')
 		;
 	}
 }
-- 
cgit v1.2.1