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